diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-08 10:22:50 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-08 10:22:50 +0000 |
| commit | 01289b14a7cbe0e1a1e135349037b0e7ba5fe70b (patch) | |
| tree | f356a9b03834bc459ab5896eb185b7b10120f071 /source3/nsswitch | |
| parent | bbf8961b284a877b5cfa4101e0fd677664a867f1 (diff) | |
| download | samba-01289b14a7cbe0e1a1e135349037b0e7ba5fe70b.tar.gz samba-01289b14a7cbe0e1a1e135349037b0e7ba5fe70b.tar.bz2 samba-01289b14a7cbe0e1a1e135349037b0e7ba5fe70b.zip | |
Make sure that the 'remote' machine name can only be set once. For some weird
reason, during a Win2003 installation, when you select 'domain join' it sends
one machine name in the name exchange, and litraly 'machinename' during the
NTLMSSP login.
Also fix up winbindd's logfile handling, so that it matches smbd and nmbd.
(This helps me, by seperating the logs by pid).
Andrew Bartlett
(This used to be commit afe5a3832f79131fb74461577f1db0e5e8bf4b6d)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index ad37768c09..921f7d2864 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -43,15 +43,9 @@ static BOOL reload_services_file(BOOL test) } } - snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE); - lp_set_logfile(logfile); - reopen_logs(); ret = lp_load(dyn_CONFIGFILE,False,False,True); - snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE); - lp_set_logfile(logfile); - reopen_logs(); load_interfaces(); @@ -823,13 +817,12 @@ static void usage(void) fault_setup((void (*)(void *))fault_quit ); - snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE); - lp_set_logfile(logfile); - /* Initialise for running in non-root mode */ sec_init(); + set_remote_machine_name("winbindd", False); + /* Set environment variable so we don't recursively call ourselves. This may also be useful interactively. */ |