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_mynames.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'source3/nmbd/nmbd_mynames.c') diff --git a/source3/nmbd/nmbd_mynames.c b/source3/nmbd/nmbd_mynames.c index c36df21e7b..7ea8ffc946 100644 --- a/source3/nmbd/nmbd_mynames.c +++ b/source3/nmbd/nmbd_mynames.c @@ -28,7 +28,6 @@ extern int DEBUGLEVEL; extern char **my_netbios_names; extern fstring global_myworkgroup; -extern pstring scope; extern uint16 samba_nb_type; /* Samba's NetBIOS type. */ @@ -119,13 +118,13 @@ BOOL register_my_workgroup_and_names(void) */ struct nmb_name nmbname; - make_nmb_name(&nmbname, my_netbios_names[i],0x20, scope); + make_nmb_name(&nmbname, my_netbios_names[i],0x20); insert_permanent_name_into_unicast(subrec, &nmbname, samba_nb_type); - make_nmb_name(&nmbname, my_netbios_names[i],0x3, scope); + make_nmb_name(&nmbname, my_netbios_names[i],0x3); insert_permanent_name_into_unicast(subrec, &nmbname, samba_nb_type); - make_nmb_name(&nmbname, my_netbios_names[i],0x0, scope); + make_nmb_name(&nmbname, my_netbios_names[i],0x0); insert_permanent_name_into_unicast(subrec, &nmbname, samba_nb_type); } } @@ -142,10 +141,10 @@ BOOL register_my_workgroup_and_names(void) */ struct nmb_name nmbname; - make_nmb_name(&nmbname, global_myworkgroup, 0x0, scope); + make_nmb_name(&nmbname, global_myworkgroup, 0x0); insert_permanent_name_into_unicast(subrec, &nmbname, samba_nb_type|NB_GROUP); - make_nmb_name(&nmbname, global_myworkgroup, 0x1e, scope); + make_nmb_name(&nmbname, global_myworkgroup, 0x1e); insert_permanent_name_into_unicast(subrec, &nmbname, samba_nb_type|NB_GROUP); } } -- cgit