Big change to make nmbd code more readable/understandable.

Main change is removal of find_name_search() confusion.
This has been replaced with find_name_on_subnet() which
makes it explicit what is being searched.

Also changed wins_subnet to be wins_client_subnet in
preparation for splitting the wins subnet into client
and server pieces.

This is a big nmbd change and I'd appreciate any
bug reports.

Specific changes follow :

asyncdns.c:
     Removed wins entry from add_netbios_entry(). This is now
     explicit in the subnet_record parameter.

interface.c:
     iface_bcast(), iface_nmask(), iface_ip() return the
     default interface if none can be found. Made this
     behavior explicit - some code in nmbd incorrectly
     depended upon this (reply_name_status() for instance).

nameannounce.c:
     find_name_search changes to find_name_on_subnet.

namebrowse.c:
     wins_subnet renamed to wins_client_subnet.

namedbname.c:
     find_name_search removed. find_name_on_subnet added.
     add_netbios_entry - wins parameter removed.

namedbsubnet.c:
     find_req_subnet removed - not explicit enough.

nameelect.c:
     wins_subnet renamed to wins_client_subnet.

namepacket.c:
     listening() simplified.

nameresp.c:
     wins_subnet renamed to wins_client_subnet.

nameserv.c:
     find_name_search moved to find_name_on_subnet.

nameserv.h:
     FIND_XXX  -> changed to FIND_SELF_NAME, FIND_ANY_NAME.

nameservreply.c:
     find_name_search moved to find_name_on_subnet.
     Debug entries changed.

nameservresp.c:
     wins_subnet renamed to wins_client_subnet.

namework.c:
     wins_subnet renamed to wins_client_subnet.

nmbd.c:
     wins parameter removed from add_netbios_entry.

nmbsync:
     wins_subnet renamed to wins_client_subnet.

proto.h: The usual.

server.c:
     remove accepted fd from fd_set.

Jeremy (jallison@whistle.com)
(This used to be commit 2c97b33fc0b5ef181dbf51a50cb61074935165bf)

1 files changed, 3 insertions, 4 deletions

diff --git a/source3/nameresp.c b/source3/nameresp.c
index 81624fcaf1..de1f33c717 100644
--- a/source3/nameresp.c
+++ b/source3/nameresp.c
@@ -61,15 +61,14 @@ static void dead_netbios_entry(struct subnet_record *d,
 	  
 	  if ((!NAME_GROUP(n->nb_flags)))
 	    {
-	      struct subnet_record *d1 = wins_subnet;
+	      struct subnet_record *d1 = wins_client_subnet;
 	      if (d1)
 		{
 		  /* remove the name that had been registered with us,
 		     and we're now getting no response when challenging.
 		     see rfc1001.txt 15.5.2
 		     */
-		  remove_netbios_name(d1, n->name.name, n->name.name_type,
-				      REGISTER, n->send_ip);
+		  remove_netbios_name(d1, n->name.name, n->name.name_type, REGISTER);
 		}
 	    }
 	}
@@ -271,7 +270,7 @@ struct response_record *queue_netbios_pkt_wins(
 
   if (zero_ip(send_ip)) return NULL;
 
-  return queue_netbios_packet(wins_subnet,fd, quest_type, state, 
+  return queue_netbios_packet(wins_client_subnet,fd, quest_type, state, 
 		       name, name_type, nb_flags, ttl,
                server_type,my_name,my_comment,
 		       False, True, send_ip, reply_to_ip, 0);