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/smbd | |
| 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/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 4 | ||||
| -rw-r--r-- | source3/smbd/server.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 71e880476c..fb730bc625 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -87,8 +87,8 @@ int reply_special(char *inbuf,char *outbuf) name2[15] = 0; } - set_local_machine_name(name1); - set_remote_machine_name(name2); + set_local_machine_name(name1, True); + set_remote_machine_name(name2, True); DEBUG(2,("netbios connect: local=%s remote=%s\n", get_local_machine_name(), get_remote_machine_name() )); diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 0bcfcb9c78..aff402df66 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -398,7 +398,7 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_ /* this is needed so that we get decent entries in smbstatus for port 445 connects */ - set_remote_machine_name(get_socket_addr(smbd_server_fd())); + set_remote_machine_name(get_socket_addr(smbd_server_fd()), False); /* Reset global variables in util.c so that client substitutions will be @@ -706,7 +706,7 @@ static BOOL init_structs(void ) load_case_tables(); - set_remote_machine_name("smbd"); + set_remote_machine_name("smbd", False); if (interactive) { Fork = False; |