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_dmb.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_dmb.c')
| -rw-r--r-- | source3/nmbd/nmbd_become_dmb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd_become_dmb.c b/source3/nmbd/nmbd_become_dmb.c index ae809607dc..76d92c2f3e 100644 --- a/source3/nmbd/nmbd_become_dmb.c +++ b/source3/nmbd/nmbd_become_dmb.c @@ -26,7 +26,6 @@ extern int DEBUGLEVEL; -extern pstring scope; extern pstring global_myname; extern fstring global_myworkgroup; extern char **my_netbios_names; @@ -133,7 +132,7 @@ in workgroup %s on subnet %s\n", will stop us syncing with ourself if we are also a local master browser. */ - make_nmb_name(&nmbname, global_myname, 0x20, scope); + make_nmb_name(&nmbname, global_myname, 0x20); work->dmb_name = nmbname; /* Pick the first interface ip address as the domain master browser ip. */ @@ -282,7 +281,7 @@ static void become_domain_master_browser_bcast(char *workgroup_name) if (work && (work->dom_state == DOMAIN_NONE)) { struct nmb_name nmbname; - make_nmb_name(&nmbname,workgroup_name,0x1b,scope); + make_nmb_name(&nmbname,workgroup_name,0x1b); /* * Check for our name on the given broadcast subnet first, only initiate @@ -330,7 +329,7 @@ static void become_domain_master_browser_wins(char *workgroup_name) { struct nmb_name nmbname; - make_nmb_name(&nmbname,workgroup_name,0x1b,scope); + make_nmb_name(&nmbname,workgroup_name,0x1b); /* * Check for our name on the unicast subnet first, only initiate |