svn commit: samba r2470 - in branches/SAMBA_3_0/source: nmbd
nsswitch
vlendec at samba.org
vlendec at samba.org
Tue Sep 21 09:07:43 GMT 2004
Author: vlendec
Date: 2004-09-21 09:07:42 +0000 (Tue, 21 Sep 2004)
New Revision: 2470
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source&rev=2470&nolog=1
Log:
Fix bug 1797: winbind and nmbd ignored "-l" option.
Thanks to Igor Zhbanov bsg at uniyar.ac.ru.
Volker
Modified:
branches/SAMBA_3_0/source/nmbd/nmbd.c
branches/SAMBA_3_0/source/nsswitch/winbindd.c
Changeset:
Modified: branches/SAMBA_3_0/source/nmbd/nmbd.c
===================================================================
--- branches/SAMBA_3_0/source/nmbd/nmbd.c 2004-09-21 08:46:47 UTC (rev 2469)
+++ branches/SAMBA_3_0/source/nmbd/nmbd.c 2004-09-21 09:07:42 UTC (rev 2470)
@@ -29,6 +29,8 @@
extern BOOL global_in_nmbd;
+extern BOOL override_logfile;
+
/* are we running as a daemon ? */
static BOOL is_daemon;
@@ -623,8 +625,10 @@
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 );
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd.c 2004-09-21 08:46:47 UTC (rev 2469)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c 2004-09-21 09:07:42 UTC (rev 2470)
@@ -28,6 +28,8 @@
BOOL opt_nocache = False;
BOOL opt_dual_daemon = True;
+extern BOOL override_logfile;
+
/* Reload configuration */
static BOOL reload_services_file(void)
@@ -853,8 +855,10 @@
exit(1);
}
- pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE);
- lp_set_logfile(logfile);
+ if (!override_logfile) {
+ pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE);
+ lp_set_logfile(logfile);
+ }
setup_logging("winbindd", log_stdout);
reopen_logs();
More information about the samba-cvs
mailing list