diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-01-07 06:55:36 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-01-07 06:55:36 +0000 |
| commit | 171da4d78736730557a94b44af9f2d62081b80ba (patch) | |
| tree | ad74341f9d50a521baec09c65637b81b150a0891 /source3/utils | |
| parent | 102e44e446035bdcc7611b8b556d0e20978fbb80 (diff) | |
| download | samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.gz samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.bz2 samba-171da4d78736730557a94b44af9f2d62081b80ba.zip | |
this looks like a big commit, but it isn't really :)
This fixes our netbios scope handling. We now have a 'netbios scope' option
in smb.conf and the scope option is removed from make_nmb_name()
this was prompted by a bug in our PDC finding code where it didn't append
the scope to the query of the '*' name.
(This used to be commit b563be824b8c3141c49558eced7829b48d4ab26f)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/nmblookup.c | 11 | ||||
| -rw-r--r-- | source3/utils/rpctorture.c | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c index 6214c0e45b..8e26a206ca 100644 --- a/source3/utils/nmblookup.c +++ b/source3/utils/nmblookup.c @@ -26,8 +26,6 @@ extern int DEBUGLEVEL; -extern pstring scope; - extern struct in_addr ipzero; static BOOL use_bcast = True; @@ -178,9 +176,12 @@ int main(int argc,char *argv[]) translate_addresses = !translate_addresses; break; case 'i': - fstrcpy(scope,optarg); - strupper(scope); - break; + { + extern pstring global_scope; + pstrcpy(global_scope,optarg); + strupper(global_scope); + } + break; case 'M': find_master = True; break; diff --git a/source3/utils/rpctorture.c b/source3/utils/rpctorture.c index fb08d70011..c80cfe4ade 100644 --- a/source3/utils/rpctorture.c +++ b/source3/utils/rpctorture.c @@ -29,7 +29,6 @@ #define REGISTER 0 #endif -extern pstring scope; extern pstring global_myname; extern pstring user_socket_options; @@ -69,8 +68,8 @@ static BOOL rpcclient_connect(struct client_info *info) struct nmb_name calling; struct nmb_name called; - make_nmb_name(&called , dns_to_netbios_name(info->dest_host ), info->name_type, scope); - make_nmb_name(&calling, dns_to_netbios_name(info->myhostname), 0x0 , scope); + make_nmb_name(&called , dns_to_netbios_name(info->dest_host ), info->name_type); + make_nmb_name(&calling, dns_to_netbios_name(info->myhostname), 0x0); if (!cli_establish_connection(smb_cli, info->dest_host, &info->dest_ip, |