diff options
author | Gerald Carter <jerry@samba.org> | 2005-02-01 20:43:14 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:31 -0500 |
commit | c1b9243c2892220b906df86d7b021d1bf18571b6 (patch) | |
tree | 09d09cfba9f9d9f6bb007301c0294061ff2a3477 /source3/smbd/lanman.c | |
parent | 92bbd3151d2b72ebeef8b79b86b5eab84fad3898 (diff) | |
download | samba-c1b9243c2892220b906df86d7b021d1bf18571b6.tar.gz samba-c1b9243c2892220b906df86d7b021d1bf18571b6.tar.bz2 samba-c1b9243c2892220b906df86d7b021d1bf18571b6.zip |
r5165: BUG 2295: always use get_local_machine_name() rather than digging in the gloval variable 'local_machine'
(This used to be commit 6a6e4af46a5c0a693a3dd9d558a4d1c1e5d72d95)
Diffstat (limited to 'source3/smbd/lanman.c')
-rw-r--r-- | source3/smbd/lanman.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 9f2cd21425..d8c5201ce6 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -32,8 +32,6 @@ #endif #define CHECK_TYPES 0 -extern fstring local_machine; - #define NERR_Success 0 #define NERR_badpass 86 #define NERR_notsupported 50 @@ -2372,7 +2370,7 @@ static BOOL api_RNetServerGetInfo(connection_struct *conn,uint16 vuid, char *par p = *rdata; p2 = p + struct_len; if (uLevel != 20) { - srvstr_push(NULL, p,local_machine,16, + srvstr_push(NULL, p,get_local_machine_name(),16, STR_ASCII|STR_UPPER|STR_TERMINATE); } p += 16; @@ -2387,7 +2385,7 @@ static BOOL api_RNetServerGetInfo(connection_struct *conn,uint16 vuid, char *par if ((count=get_server_info(SV_TYPE_ALL,&servers,lp_workgroup()))>0) { for (i=0;i<count;i++) { - if (strequal(servers[i].name,local_machine)) { + if (strequal(servers[i].name,get_local_machine_name())) { servertype = servers[i].type; push_ascii(comment,servers[i].comment,sizeof(pstring),STR_TERMINATE); } @@ -2460,7 +2458,7 @@ static BOOL api_NetWkstaGetInfo(connection_struct *conn,uint16 vuid, char *param SIVAL(p,0,PTR_DIFF(p2,*rdata)); /* host name */ - pstrcpy(p2,local_machine); + pstrcpy(p2,get_local_machine_name()); strupper_m(p2); p2 = skip_string(p2,1); p += 4; @@ -2881,7 +2879,7 @@ static BOOL api_WWkstaUserLogon(connection_struct *conn,uint16 vuid, char *param { fstring mypath; fstrcpy(mypath,"\\\\"); - fstrcat(mypath,local_machine); + fstrcat(mypath,get_local_machine_name()); strupper_m(mypath); PACKS(&desc,"z",mypath); /* computer */ } |