From bfa1b2a8bdd785af576c8706e8f27e9448ef94b5 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 26 Mar 2004 15:40:06 +0000
Subject: source code fix for bug 1095 -- honor the '-l' option (This used to
 be commit ab48af6993b427f525c36aa0ffd57c612c100561)

---
 source3/lib/debug.c       | 7 +++++++
 source3/lib/popt_common.c | 2 ++
 2 files changed, 9 insertions(+)

(limited to 'source3/lib')

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 0050761e9a..1a926053bb 100644
--- 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 9a5a112022..6c35213d43 100644
--- 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;
 
-- 
cgit