sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

r2470: Fix bug 1797: winbind and nmbd ignored "-l" option.

Browse Source 
Thanks to Igor Zhbanov bsg@uniyar.ac.ru.

Volker
(This used to be commit 8a28475a0b)
This commit is contained in:
Volker Lendecke
2004-09-21 09:07:42 +00:00
committed by Gerald (Jerry) Carter
parent 0b9e4a98c8
commit 3b015a4cc7
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source3/nmbd/nmbd.c
View File

@ -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 );

8
source3/nsswitch/winbindd.c
View File

@ -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 @@ int main(int argc, char **argv)
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();