r7525: Unify lp_load(), load_interfaces and logging setup into popt().

There is now a new --debug-stderr option to enable debug to STDERR.

popt isn't perfect, but the callbacks are used in all the main Samba
binaries, and should be used in the rest.  This avoids duplicated
code, and ensures every binary is setup correctly.

This also ensures the setup happens early enough to have -s function,
and have a correct impact on the credentials code.  (Fixing a bug that
frustrated tridge earlier today).

The only 'subtle' aspect of all this is that I'm pretty sure that the
SAMBA_COMMON popt code must be above the CREDENTIALS code, in the
popt tables.

Andrew Bartlett
(This used to be commit 50f3c2b3a22971f40e0d3a88127b5120bfc47591)

1 files changed, 17 insertions, 5 deletions

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 94b72c520d..fec85281ef 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -38,7 +38,7 @@
  *		-i,--scope
  */
 
-enum {OPT_OPTION=1,OPT_LEAK_REPORT,OPT_LEAK_REPORT_FULL};
+enum {OPT_OPTION=1,OPT_LEAK_REPORT,OPT_LEAK_REPORT_FULL, OPT_DEBUG_STDERR};
 
 struct cli_credentials *cmdline_credentials = NULL;
 
@@ -49,6 +49,14 @@ static void popt_common_callback(poptContext con,
 {
 	const char *pname;
 	
+	if (reason == POPT_CALLBACK_REASON_POST) {
+		/* Hook any 'every Samba program must do this, after
+		 * the smb.conf is setup' functions here */
+		lp_load(dyn_CONFIGFILE,True,False,False);
+		load_interfaces();
+		return;
+	}
+
 	/* Find out basename of current program */
 	pname = strrchr_m(poptGetInvocationName(con),'/');
 
@@ -58,9 +66,7 @@ static void popt_common_callback(poptContext con,
 		pname++;
 
 	if (reason == POPT_CALLBACK_REASON_PRE) {
-		char *logfile = talloc_asprintf(NULL, "%s/log.%s", dyn_LOGFILEBASE, pname);
-		lp_set_cmdline("log file", logfile);
-		talloc_free(logfile);
+		setup_logging(pname, DEBUG_STDOUT);
 		return;
 	}
 
@@ -69,6 +75,10 @@ static void popt_common_callback(poptContext con,
 		lp_set_cmdline("log level", arg);
 		break;
 
+	case OPT_DEBUG_STDERR:
+		setup_logging(pname, DEBUG_STDERR);
+		break;
+
 	case 'V':
 		printf( "Version %s\n", SAMBA_VERSION_STRING );
 		exit(0);
@@ -128,6 +138,7 @@ static void popt_common_callback(poptContext con,
 	case OPT_LEAK_REPORT_FULL:
 		talloc_enable_leak_report_full();
 		break;
+
 	}
 }
 
@@ -143,8 +154,9 @@ struct poptOption popt_common_connection[] = {
 };
 
 struct poptOption popt_common_samba[] = {
-	{ NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE, popt_common_callback },
+	{ NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, popt_common_callback },
 	{ "debuglevel",   'd', POPT_ARG_STRING, NULL, 'd', "Set debug level", "DEBUGLEVEL" },
+	{ "debug-stderr", 0, POPT_ARG_NONE, NULL, OPT_DEBUG_STDERR, "Send debug output to STDERR", NULL },
 	{ "configfile",   's', POPT_ARG_STRING, NULL, 's', "Use alternative configuration file", "CONFIGFILE" },
 	{ "option",         0, POPT_ARG_STRING, NULL, OPT_OPTION, "Set smb.conf option from command line", "name=value" },
 	{ "log-basename", 'l', POPT_ARG_STRING, NULL, 'l', "Basename for log/debug files", "LOGFILEBASE" },