summaryrefslogtreecommitdiffstats
path: root/source/nmbd/nmbd.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2004-09-21 09:07:42 +0000
committerVolker Lendecke <vlendec@samba.org>2004-09-21 09:07:42 +0000
commitc87cb3c673e9820b83a778e31ceef5466095e061 (patch)
treed7ec72ed3ff93f6f82f0b6e1a206bea68b9b401e /source/nmbd/nmbd.c
parent0fe438a144b2d1707b9294fa5621729c774c3570 (diff)
downloadsamba-c87cb3c673e9820b83a778e31ceef5466095e061.tar.gz
samba-c87cb3c673e9820b83a778e31ceef5466095e061.tar.xz
samba-c87cb3c673e9820b83a778e31ceef5466095e061.zip
r2470: Fix bug 1797: winbind and nmbd ignored "-l" option.
Thanks to Igor Zhbanov bsg@uniyar.ac.ru. Volker
Diffstat (limited to 'source/nmbd/nmbd.c')
-rw-r--r--source/nmbd/nmbd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index 880de7f91bf..f8006a22a9e 100644
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -29,6 +29,8 @@ int global_nmb_port = -1;
extern BOOL global_in_nmbd;
+extern BOOL override_logfile;
+
/* are we running as a daemon ? */
static BOOL is_daemon;
@@ -623,8 +625,10 @@ static BOOL open_sockets(BOOL isdaemon, int port)
sys_srandom(time(NULL) ^ sys_getpid());
- slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
- lp_set_logfile(logfile);
+ if (!override_logfile) {
+ slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
+ lp_set_logfile(logfile);
+ }
fault_setup((void (*)(void *))fault_continue );