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/libsmb/namequery.c | |
parent | 102e44e446035bdcc7611b8b556d0e20978fbb80 (diff) | |
download | samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.gz samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.xz 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/libsmb/namequery.c')
-rw-r--r-- | source3/libsmb/namequery.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 3898a721c6..08f26f10d5 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -22,7 +22,6 @@ #include "includes.h" -extern pstring scope; extern int DEBUGLEVEL; /* nmbd.c sets this to True. */ @@ -131,7 +130,7 @@ static BOOL internal_name_status(int fd,char *name,int name_type,BOOL recurse, nmb->header.nscount = 0; nmb->header.arcount = 0; - make_nmb_name(&nmb->question.question_name,name,name_type,scope); + make_nmb_name(&nmb->question.question_name,name,name_type); nmb->question.question_type = 0x21; nmb->question.question_class = 0x1; @@ -238,7 +237,7 @@ struct in_addr *name_query(int fd,const char *name,int name_type, nmb->header.nscount = 0; nmb->header.arcount = 0; - make_nmb_name(&nmb->question.question_name,name,name_type,scope); + make_nmb_name(&nmb->question.question_name,name,name_type); nmb->question.question_type = 0x20; nmb->question.question_class = 0x1; @@ -781,8 +780,8 @@ BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pd dgram->header.dgm_length = 0; /* Let build_dgram() handle this. */ dgram->header.packet_offset = 0; - make_nmb_name(&dgram->source_name,srcname,0,scope); - make_nmb_name(&dgram->dest_name,domain,0x1B,scope); + make_nmb_name(&dgram->source_name,srcname,0); + make_nmb_name(&dgram->dest_name,domain,0x1B); ptr = &dgram->data[0]; |