charcnv.c: Fixed silly bugs detected on IRIX.

client.c:	Fixed silly bugs detected on IRIX.
namedbname.c:	Stopped 1d names from being registered in WINS db.
namedbsubnet.c:	Only register 1e names on broadcast subnet.
nameelect.c:	Changed add_my_name entries. Forced host announces if we
                have less than 10 servers listed. Fixed registering 1b
                domain name issues.
namepacket.c:	Added error message when dgram discarded.
nameserv.c:	Added notion of 'direct' names that are not registered on
                the network. Needed to get around bugs in earlier nmbd
                handling of DOMAIN(1b) names.
nameservreply.c:Tidied up debug message.
nameservresp.c:	Added response_name_query_domain() code. Deals with
                re-registering DOMAIN(1b) name.
nmbd.c:		Fixed silly bugs detected on IRIX.
nmblib.c:	Added paranoia debugs.
proto.h:	Updated remove_name_entry(), add_my_name_entry().
server.c:	Fixed silly bugs detected on IRIX.
trans2.c:	Fixed silly bugs detected on IRIX.
uid.c:		Fixed silly bugs detected on IRIX.
version.h:	Updated to alpha3.
Jeremy (jallison@whistle.com).
(This used to be commit f08222bd8b86a061c52d22015f946a4737eb47fd)

1 files changed, 9 insertions, 2 deletions

diff --git a/source3/namedbname.c b/source3/namedbname.c
index aa41726450..5eb03bc637 100644
--- a/source3/namedbname.c
+++ b/source3/namedbname.c
@@ -419,7 +419,7 @@ struct name_record *add_netbios_entry(struct subnet_record *d,
   struct name_record *n2=NULL;
   struct subnet_record *found_subnet = 0;
   int search = 0;
-  BOOL self = source == SELF;
+  BOOL self = (source == SELF);
 
   /* add the name to the WINS list if the name comes from a directed query */
   search |= wins ? FIND_WINS : FIND_LOCAL;
@@ -434,12 +434,19 @@ struct name_record *add_netbios_entry(struct subnet_record *d,
 
   if (!self)
   {
-    if (!wins && type != 0x1b)
+    if (!wins && (type != 0x1b))
     {
        /* the only broadcast (non-WINS) names we are adding are ours
           (SELF) and Domain Master type names */
        return NULL;
     }
+    if(wins && (type == 0x1d))
+    {
+      /* Do not allow any 0x1d names to be registered in a WINS,
+         database although we return success for them.
+       */
+      return NULL;
+    }
   }
 
   n = (struct name_record *)malloc(sizeof(*n));