summaryrefslogtreecommitdiff
path: root/source3/smbd/trans2.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-02-01 20:43:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:31 -0500
commitc1b9243c2892220b906df86d7b021d1bf18571b6 (patch)
tree09d09cfba9f9d9f6bb007301c0294061ff2a3477 /source3/smbd/trans2.c
parent92bbd3151d2b72ebeef8b79b86b5eab84fad3898 (diff)
downloadsamba-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/trans2.c')
-rw-r--r--source3/smbd/trans2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b5029ccd77..18fd5c946f 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -25,7 +25,6 @@
extern enum protocol_types Protocol;
extern int smb_read_error;
-extern fstring local_machine;
extern int global_oplock_break;
extern uint32 global_client_caps;
extern struct current_user current_user;
@@ -1825,7 +1824,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_dev, (unsi
* Add volume serial number - hash of a combination of
* the called hostname and the service name.
*/
- SIVAL(pdata,0,str_checksum(lp_servicename(snum)) ^ (str_checksum(local_machine)<<16) );
+ SIVAL(pdata,0,str_checksum(lp_servicename(snum)) ^ (str_checksum(get_local_machine_name())<<16) );
len = srvstr_push(outbuf, pdata+l2_vol_szVolLabel, vname, -1, STR_NOALIGN);
SCVAL(pdata,l2_vol_cch,len);
data_len = l2_vol_szVolLabel + len;
@@ -1868,7 +1867,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_dev, (unsi
* the called hostname and the service name.
*/
SIVAL(pdata,8,str_checksum(lp_servicename(snum)) ^
- (str_checksum(local_machine)<<16));
+ (str_checksum(get_local_machine_name())<<16));
len = srvstr_push(outbuf, pdata+18, vname, -1, STR_UNICODE);
SIVAL(pdata,12,len);