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/nmbd/nmbd_become_lmb.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/nmbd/nmbd_become_lmb.c')
-rw-r--r-- | source3/nmbd/nmbd_become_lmb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd_become_lmb.c b/source3/nmbd/nmbd_become_lmb.c index f3fa69132e..31c67ae7f3 100644 --- a/source3/nmbd/nmbd_become_lmb.c +++ b/source3/nmbd/nmbd_become_lmb.c @@ -25,7 +25,6 @@ #include "includes.h" extern int DEBUGLEVEL; -extern pstring scope; extern pstring global_myname; extern uint16 samba_nb_type; /* Samba's NetBIOS name type. */ @@ -126,7 +125,7 @@ in workgroup %s on subnet %s\n", * master browser. */ - make_nmb_name(&nmbname, work->work_group, 0x1d, scope); + make_nmb_name(&nmbname, work->work_group, 0x1d); remove_permanent_name_from_unicast( subrec, &nmbname); @@ -208,7 +207,7 @@ static void release_1d_name( struct subnet_record *subrec, char *workgroup_name, struct nmb_name nmbname; struct name_record *namerec; - make_nmb_name(&nmbname, workgroup_name, 0x1d, scope); + make_nmb_name(&nmbname, workgroup_name, 0x1d); if((namerec = find_name_on_subnet( subrec, &nmbname, FIND_SELF_NAME))!=NULL) { struct userdata_struct *userdata; @@ -308,7 +307,7 @@ in workgroup %s on subnet %s\n", release_1d_name( subrec, work->work_group, force_new_election); /* Deregister any browser names we may have. */ - make_nmb_name(&nmbname, MSBROWSE, 0x1, scope); + make_nmb_name(&nmbname, MSBROWSE, 0x1); if((namerec = find_name_on_subnet( subrec, &nmbname, FIND_SELF_NAME))!=NULL) { release_name(subrec, namerec, |