JHT ===> Update only.

[samba.git] / source / namework.c

diff --git a/source/namework.c b/source/namework.c
index ff623e69dbf94a7cc42a5795c2c0f00117233a9c..3e1ac220058bd20b3578d745a46fc9fa7b61c99f 100644 (file)
--- a/source/namework.c
+++ b/source/namework.c
@@ -112,7 +112,7 @@ void tell_become_backup(void)
              
              num_servers++;
              
-             if (strequal(myname, s->serv.name)) continue;
+             if (is_myname(s->serv.name)) continue;
              
              if (s->serv.type & SV_TYPE_BACKUP_BROWSER) {
                num_backups++;
@@ -153,7 +153,7 @@ void tell_become_backup(void)
 BOOL same_context(struct dgram_packet *dgram)
 {
   if (!strequal(dgram->dest_name  .scope,scope )) return(True);
-  if ( strequal(dgram->source_name.name ,myname)) return(True);
+  if ( is_myname(dgram->source_name.name)) return(True);
   
   return(False);
 }
@@ -263,16 +263,6 @@ static void process_localnet_announce(struct packet_struct *p,uint16 command,cha
      disabling it */
   tell_become_backup();
 #endif
-
-#if 0 /* JRA TEST - I Think this code should not be here */
-  /* get the local_only browse list from the local master and add it 
-     to ours. */
-  if (command == ANN_LocalMasterAnnouncement)
-  {
-    add_browser_entry(serv_name,dgram->dest_name.name_type,
-                     work->work_group,30,p->ip,True);
-  }
-#endif /* END JRA TEST */
 }
 
 /*******************************************************************
@@ -634,7 +624,7 @@ static void process_announce_request(struct packet_struct *p,char *buf)
   DEBUG(3,("process_announce_request: Announce request from %s to %s token=0x%X\n",
           name,namestr(&dgram->dest_name), token));
   
-  if (strequal(dgram->source_name.name,myname)) return;
+  if (is_myname(dgram->source_name.name)) return;
   
   /* XXXX BUG or FEATURE?: need to ensure that we are a member of
      this workgroup before announcing, particularly as we only