From ab48af6993b427f525c36aa0ffd57c612c100561 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 26 Mar 2004 15:40:06 +0000 Subject: [PATCH] source code fix for bug 1095 -- honor the '-l' option --- source/client/client.c | 8 ++++++-- source/lib/debug.c | 7 +++++++ source/lib/popt_common.c | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/source/client/client.c b/source/client/client.c index 214b7872979..1da35fcc439 100644 --- a/source/client/client.c +++ b/source/client/client.c @@ -2853,6 +2853,7 @@ static int do_message_op(void) int main(int argc,char *argv[]) { extern BOOL AllowDebugChange; + extern BOOL override_logfile; pstring base_directory; int opt; pstring query_host; @@ -2989,11 +2990,14 @@ static int do_message_op(void) /* save the workgroup... - FIXME!! do we need to do tyhis for other options as well + FIXME!! do we need to do this for other options as well (or maybe a generic way to keep lp_load() from overwriting everything)? */ - fstrcpy( new_workgroup, lp_workgroup() ); + fstrcpy( new_workgroup, lp_workgroup() ); + + if ( override_logfile ) + setup_logging( lp_logfile(), False ); if (!lp_load(dyn_CONFIGFILE,True,False,False)) { fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n", diff --git a/source/lib/debug.c b/source/lib/debug.c index 0050761e9a8..1a926053bb0 100644 --- a/source/lib/debug.c +++ b/source/lib/debug.c @@ -84,6 +84,13 @@ BOOL debug_warn_unknown_class = True; BOOL debug_auto_add_unknown_class = True; BOOL AllowDebugChange = True; +/* + used to check if the user specified a + logfile on the command line +*/ +BOOL override_logfile; + + /* * This is to allow assignment to DEBUGLEVEL before the debug * system has been initialised. diff --git a/source/lib/popt_common.c b/source/lib/popt_common.c index 9a5a1120225..6c35213d43a 100644 --- a/source/lib/popt_common.c +++ b/source/lib/popt_common.c @@ -35,6 +35,7 @@ extern pstring user_socket_options; extern BOOL AllowDebugChange; +extern BOOL override_logfile; struct user_auth_info cmdline_auth_info; @@ -95,6 +96,7 @@ static void popt_common_callback(poptContext con, if (arg) { pstr_sprintf(logfile, "%s/log.%s", arg, pname); lp_set_logfile(logfile); + override_logfile = True; } break; -- 2.34.1