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/msdfs.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/msdfs.c')
| -rw-r--r-- | source3/smbd/msdfs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index b5ae7486d3..184dde1635 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -22,7 +22,6 @@ #include "includes.h" -extern fstring local_machine; extern uint32 global_client_caps; /********************************************************************** @@ -462,7 +461,7 @@ BOOL get_referred_path(char *pathname, struct junction_map *jucn, parse_dfs_path(pathname, &dp); /* Verify hostname in path */ - if (local_machine && (!strequal(local_machine, dp.hostname))) { + if ( !strequal(get_local_machine_name(), dp.hostname) ) { /* Hostname mismatch, check if one of our IP addresses */ if (!ismyip(*interpret_addr2(dp.hostname))) { DEBUG(3, ("get_referred_path: Invalid hostname %s in path %s\n", @@ -810,7 +809,7 @@ BOOL create_junction(char* pathname, struct junction_map* jucn) parse_dfs_path(pathname,&dp); /* check if path is dfs : validate first token */ - if (local_machine && (!strequal(local_machine,dp.hostname))) { + if ( !strequal(get_local_machine_name(),dp.hostname) ) { /* Hostname mismatch, check if one of our IP addresses */ if (!ismyip(*interpret_addr2(dp.hostname))) { @@ -978,7 +977,7 @@ static BOOL form_junctions(int snum, struct junction_map* jucn, int* jn_count) } slprintf(ref->alternate_path, sizeof(pstring)-1, - "\\\\%s\\%s", local_machine, service_name); + "\\\\%s\\%s", get_local_machine_name(), service_name); cnt++; /* Now enumerate all dfs links */ |