summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-03-26 15:40:06 +0000
committerGerald Carter <jerry@samba.org>2004-03-26 15:40:06 +0000
commitbfa1b2a8bdd785af576c8706e8f27e9448ef94b5 (patch)
tree2f2e9f5eac6386daa3b653e18f7f3bb00b88db9a /source3/lib
parent2732b702fb956169efb7096a8305b677b56b8706 (diff)
downloadsamba-bfa1b2a8bdd785af576c8706e8f27e9448ef94b5.tar.gz
samba-bfa1b2a8bdd785af576c8706e8f27e9448ef94b5.tar.bz2
samba-bfa1b2a8bdd785af576c8706e8f27e9448ef94b5.zip
source code fix for bug 1095 -- honor the '-l' option
(This used to be commit ab48af6993b427f525c36aa0ffd57c612c100561)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/debug.c7
-rw-r--r--source3/lib/popt_common.c2
2 files changed, 9 insertions, 0 deletions
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;