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/libsmb/clientgen.c | |
| 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/libsmb/clientgen.c')
| -rw-r--r-- | source3/libsmb/clientgen.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 1e230e2ff5..0436fb9df5 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -27,7 +27,6 @@ extern int DEBUGLEVEL; extern pstring user_socket_options; -extern pstring scope; static void cli_process_oplock(struct cli_state *cli); @@ -3223,7 +3222,7 @@ BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char { struct nmb_name calling, called; - make_nmb_name(&calling, srchost, 0x0, scope); + make_nmb_name(&calling, srchost, 0x0); /* * If the called name is an IP address @@ -3231,9 +3230,9 @@ BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char */ if(is_ipaddress(desthost)) - make_nmb_name(&called, "*SMBSERVER", 0x20, scope); + make_nmb_name(&called, "*SMBSERVER", 0x20); else - make_nmb_name(&called, desthost, 0x20, scope); + make_nmb_name(&called, desthost, 0x20); if (!cli_session_request(cli, &calling, &called)) { struct nmb_name smbservername; @@ -3245,7 +3244,7 @@ BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char cli_shutdown(cli); - make_nmb_name(&smbservername , "*SMBSERVER", 0x20, scope); + make_nmb_name(&smbservername , "*SMBSERVER", 0x20); if (!nmb_name_equal(&called, &smbservername) || !cli_initialise(cli) || |