From 171da4d78736730557a94b44af9f2d62081b80ba Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 7 Jan 2000 06:55:36 +0000 Subject: 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) --- source3/nmbd/nmbd_elections.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source3/nmbd/nmbd_elections.c') diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c index 8e1605dbba..be38b572f6 100644 --- a/source3/nmbd/nmbd_elections.c +++ b/source3/nmbd/nmbd_elections.c @@ -26,8 +26,6 @@ extern int DEBUGLEVEL; -extern pstring scope; - extern pstring global_myname; extern fstring global_myworkgroup; @@ -194,7 +192,7 @@ void run_elections(time_t t) */ struct nmb_name nmbname; - make_nmb_name(&nmbname, work->work_group, 0x1e, scope); + make_nmb_name(&nmbname, work->work_group, 0x1e); if(find_name_on_subnet( subrec, &nmbname, FIND_SELF_NAME)==NULL) { DEBUG(8,("run_elections: Cannot send election packet yet as name %s not \ yet registered on subnet %s\n", nmb_namestr(&nmbname), subrec->subnet_name )); @@ -365,7 +363,7 @@ BOOL check_elections(void) */ struct nmb_name nmbname; - make_nmb_name(&nmbname, work->work_group, 0x1e, scope); + make_nmb_name(&nmbname, work->work_group, 0x1e); if(find_name_on_subnet( subrec, &nmbname, FIND_SELF_NAME)==NULL) { DEBUG(8,("check_elections: Cannot send election packet yet as name %s not \ yet registered on subnet %s\n", nmb_namestr(&nmbname), subrec->subnet_name )); -- cgit