summaryrefslogtreecommitdiff
path: root/source3/nmbd/nmbd_namequery.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-01-07 06:55:36 +0000
committerAndrew Tridgell <tridge@samba.org>2000-01-07 06:55:36 +0000
commit171da4d78736730557a94b44af9f2d62081b80ba (patch)
treead74341f9d50a521baec09c65637b81b150a0891 /source3/nmbd/nmbd_namequery.c
parent102e44e446035bdcc7611b8b556d0e20978fbb80 (diff)
downloadsamba-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_namequery.c')
-rw-r--r--source3/nmbd/nmbd_namequery.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd_namequery.c b/source3/nmbd/nmbd_namequery.c
index 8c41554842..57baa4cb2f 100644
--- a/source3/nmbd/nmbd_namequery.c
+++ b/source3/nmbd/nmbd_namequery.c
@@ -26,8 +26,6 @@
extern int DEBUGLEVEL;
-extern pstring scope;
-
/****************************************************************************
Deal with a response packet when querying a name.
****************************************************************************/
@@ -180,7 +178,7 @@ BOOL query_name(struct subnet_record *subrec, char *name, int type,
struct nmb_name nmbname;
struct name_record *namerec;
- make_nmb_name(&nmbname, name, type, scope);
+ make_nmb_name(&nmbname, name, type);
/*
* We need to check our local namelists first.
@@ -247,7 +245,7 @@ BOOL query_name_from_wins_server(struct in_addr ip_to,
{
struct nmb_name nmbname;
- make_nmb_name(&nmbname, name, type, scope);
+ make_nmb_name(&nmbname, name, type);
if(queue_query_name_from_wins_server( ip_to,
query_name_response,