sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s3: Remove smbd_server_fd() from set_local_machine_name()

Browse Source
This commit is contained in:
Volker Lendecke 2010-08-28 14:05:20 +02:00
parent 5e58156654
commit 755ef5cf11
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source3/lib/substitute.c
View File

@ -45,7 +45,6 @@ bool set_local_machine_name(const char *local_name, bool perm)
{ {
static bool already_perm = false; static bool already_perm = false;
char *tmp_local_machine = NULL; char *tmp_local_machine = NULL;
char addr[INET6_ADDRSTRLEN];
size_t len; size_t len;
tmp_local_machine = SMB_STRDUP(local_name); tmp_local_machine = SMB_STRDUP(local_name);
@ -54,20 +53,6 @@ bool set_local_machine_name(const char *local_name, bool perm)
} }
trim_char(tmp_local_machine,' ',' '); trim_char(tmp_local_machine,' ',' ');
/*
* Windows NT/2k uses "*SMBSERVER" and XP uses "*SMBSERV"
* arrggg!!!
*/
if (strequal(tmp_local_machine, "*SMBSERVER") ||
strequal(tmp_local_machine, "*SMBSERV") ) {
SAFE_FREE(local_machine);
local_machine = SMB_STRDUP(client_socket_addr(smbd_server_fd(),
addr, sizeof(addr)) );
SAFE_FREE(tmp_local_machine);
return local_machine ? true : false;
}
if (already_perm) { if (already_perm) {
return true; return true;
} }

9
source3/smbd/reply.c
View File

@ -528,6 +528,15 @@ void reply_special(struct smbd_server_connection *sconn, char *inbuf)
exit_server_cleanly("retargeted client"); exit_server_cleanly("retargeted client");
} }
/*
* Windows NT/2k uses "*SMBSERVER" and XP uses
* "*SMBSERV" arrggg!!!
*/
if (strequal(name1, "*SMBSERVER ")
|| strequal(name1, "*SMBSERV ")) {
fstrcpy(name1, sconn->client_id.addr);
}
set_local_machine_name(name1, True); set_local_machine_name(name1, True);
set_remote_machine_name(name2, True); set_remote_machine_name(name2, True);