From: Ralph Boehme <slow@samba.org>
Date: Wed, 10 Nov 2021 17:27:08 +0000 (+0100)
Subject: winbindd: remove is_default_dyn_LOGFILEBASE() logic
X-Git-Tag: ldb-2.5.0~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=117d45df47a1f3206bc38aaeaa11f2b327e43530;p=thirdparty%2Fsamba.git

winbindd: remove is_default_dyn_LOGFILEBASE() logic

Handling of -l commandline parameter is already implemented by lib/cmdline/.

is_default_dyn_LOGFILEBASE() == true is the default case and this causes us to
temporarily overwrite the configured logfile with LOGFILEBASE/log.winbindd until
winbindd_reload_services_file() restores it.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14897

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 9dd7315cf9d..1f79b325d05 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1718,15 +1718,6 @@ int main(int argc, const char **argv)
 
 	poptFreeContext(pc);
 
-	if (is_default_dyn_LOGFILEBASE()) {
-		char *lfile = NULL;
-		if (asprintf(&lfile,"%s/log.winbindd",
-				get_dyn_LOGFILEBASE()) > 0) {
-			lp_set_logfile(lfile);
-			SAFE_FREE(lfile);
-		}
-	}
-
 	reopen_logs();
 
 	DEBUG(0,("winbindd version %s started.\n", samba_version_string()));