- fix a bug in NetServerEnum where counted and total were not counted

correctly if there were multiple instances of a name. This led to the
infamous "not enough memory" error when browsing (but this isn't the
only cause of that message)

- fix a triple-chaining bug which affected OpenX following a TconX

- fix a serious nmbd bug that meant nmdb would answer packets that it
wasn't supposed to, causing havoc with browse lists.

- never time out SELF packets. This is an interim fix until I find out
why nmbd thought they should be timed out.
(This used to be commit 2960c3908c2c3b01a1f2b77def60350018d298e1)

1 files changed, 0 insertions, 80 deletions

diff --git a/source3/namework.c b/source3/namework.c
index 108048d500..90ab2fb1fb 100644
--- a/source3/namework.c
+++ b/source3/namework.c
@@ -166,22 +166,6 @@ BOOL same_context(struct dgram_packet *dgram)
 
 
 /*******************************************************************
-  am I listening on a name. XXXX check the type of name as well.
-  ******************************************************************/
-BOOL listening_name(struct work_record *work, struct nmb_name *n)
-{
-  if (strequal(n->name,myname) ||
-      strequal(n->name,work->work_group) ||
-      strequal(n->name,MSBROWSE))
-    {
-      return(True);
-    }
-  
-  return(False);
-}
-
-
-/*******************************************************************
   process a domain announcement frame
 
   Announce frames come in 3 types. Servers send host announcements
@@ -667,70 +651,6 @@ static void process_announce_request(struct packet_struct *p,char *buf)
 }
 
 
-/****************************************************************************
-depending on what announce has been made, we are only going to
-accept certain types of name announce. XXXX untested code
-
-check listening name type
-****************************************************************************/
-BOOL listening_type(struct packet_struct *p, int command)
-{
-  struct dgram_packet *dgram = &p->packet.dgram;
-  int type = dgram->dest_name.name_type;
-
-  switch (command)
-    {
-    case ANN_HostAnnouncement:
-      {
-	if (type != 0x0 || type != 0x20) return (False);
-	break;
-      }
-      
-    case ANN_AnnouncementRequest:
-      {
-	return (True);
-	break;
-      }
-      
-    case ANN_Election:
-      {
-	return (True);
-	break;
-      }
-      
-    case ANN_GetBackupListReq:
-      {
-	return (True);
-	break;
-      }
-      
-    case ANN_GetBackupListResp:
-      {
-	return (True);
-	break;
-      }
-      
-    case ANN_DomainAnnouncement:
-      {
-	if (type != 0x1b || type != 0x1c) return (False);
-	break;
-      }
-      
-    case ANN_MasterAnnouncement:
-      {
-	if (type != 0x1d) return (False);
-	break;
-      }
-      
-    case ANN_LocalMasterAnnouncement:
-      {
-	if (type != 0x1c || type != 0x1d) return (False);
-	break;
-      }
-    }
-  return (True); /* we're not dealing with unknown packet types */
-}
-
 
 /****************************************************************************
 process a browse frame