source code fix for bug 1095 -- honor the '-l' option

(This used to be commit ab48af6993b427f525c36aa0ffd57c612c100561)

diff --git a/source3/client/client.c b/source3/client/client.c
index 214b787297915841d05a2021d521637ec03beaaf..1da35fcc43918d1555543b03908fa423d2a96bb9 100644 (file)
--- a/source3/client/client.c
+++ b/source3/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/source3/lib/debug.c b/source3/lib/debug.c
index 0050761e9a8cb9dbb2fcebdc584f7e91145120c1..1a926053bb049b480d1335531cb9d22637eeb74f 100644 (file)
--- a/source3/lib/debug.c
+++ b/source3/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/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 9a5a11202255e77aada34e8c29e3d47ae90cf887..6c35213d43ae90e1fe6b3165b3fbf447a805d7a0 100644 (file)
--- a/source3/lib/popt_common.c
+++ b/source3/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;