first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

(This used to be commit 453a822a76780063dff23526c35408866d0c0154)

1 files changed, 49 insertions, 29 deletions

diff --git a/source3/nmbd/nmbd_mynames.c b/source3/nmbd/nmbd_mynames.c
index 64cb8ea9e9..c36df21e7b 100644
--- a/source3/nmbd/nmbd_mynames.c
+++ b/source3/nmbd/nmbd_mynames.c
@@ -43,6 +43,47 @@ static void my_name_register_failed(struct subnet_record *subrec,
             nmb_namestr(nmbname), subrec->subnet_name));
 }
 
+
+/****************************************************************************
+  Add my workgroup and my given names to one subnet
+  Also add the magic Samba names.
+  **************************************************************************/
+void register_my_workgroup_one_subnet(struct subnet_record *subrec)
+{
+	int i;
+
+	struct work_record *work;
+
+	/* Create the workgroup on the subnet. */
+	if((work = create_workgroup_on_subnet(subrec, global_myworkgroup, 
+					      PERMANENT_TTL)) == NULL) {
+		DEBUG(0,("register_my_workgroup_and_names: Failed to create my workgroup %s on subnet %s. \
+Exiting.\n", global_myworkgroup, subrec->subnet_name));
+		return;
+	}
+
+	/* Each subnet entry, except for the wins_server_subnet has
+           the magic Samba names. */
+	add_samba_names_to_subnet(subrec);
+
+	/* Register all our names including aliases. */
+	for (i=0; my_netbios_names[i]; i++) {
+		register_name(subrec, my_netbios_names[i],0x20,samba_nb_type,
+			      NULL,
+			      my_name_register_failed, NULL);
+		register_name(subrec, my_netbios_names[i],0x03,samba_nb_type,
+			      NULL,
+			      my_name_register_failed, NULL);
+		register_name(subrec, my_netbios_names[i],0x00,samba_nb_type,
+			      NULL,
+			      my_name_register_failed, NULL);
+	}
+	
+	/* Initiate election processing, register the workgroup names etc. */
+	initiate_myworkgroup_startup(subrec, work);
+}
+
+
 /****************************************************************************
   Add my workgroup and my given names to the subnet lists.
   Also add the magic Samba names.
@@ -51,38 +92,13 @@ static void my_name_register_failed(struct subnet_record *subrec,
 BOOL register_my_workgroup_and_names(void)
 {
   struct subnet_record *subrec;
-  struct work_record *work;
   int i;
 
-  for(subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec))
+  for(subrec = FIRST_SUBNET; 
+      subrec; 
+      subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec))
   {
-    /* Create the workgroup on the subnet. */
-    if((work = create_workgroup_on_subnet(subrec, global_myworkgroup, PERMANENT_TTL)) == NULL)
-    {
-      DEBUG(0,("register_my_workgroup_and_names: Failed to create my workgroup %s on subnet %s. \
-Exiting.\n", global_myworkgroup, subrec->subnet_name));
-      return False;
-    }
-
-    /* Each subnet entry, except for the wins_server_subnet has the magic Samba names. */
-    add_samba_names_to_subnet(subrec);
-
-    /* Register all our names including aliases. */
-    for (i=0; my_netbios_names[i]; i++) 
-    {
-      register_name(subrec, my_netbios_names[i],0x20,samba_nb_type,
-                    NULL,
-                    my_name_register_failed, NULL);
-      register_name(subrec, my_netbios_names[i],0x03,samba_nb_type,
-                    NULL,
-                    my_name_register_failed, NULL);
-      register_name(subrec, my_netbios_names[i],0x00,samba_nb_type,
-                    NULL,
-                    my_name_register_failed, NULL);
-    }
-
-    /* Initiate election processing, register the workgroup names etc. */
-    initiate_myworkgroup_startup(subrec, work);
+	  register_my_workgroup_one_subnet(subrec);
   }
 
   /* If we are not a WINS client, we still need to add the magic Samba
@@ -180,6 +196,10 @@ void refresh_my_names(time_t t)
   {
     struct name_record *namerec;
 	  
+    /* B nodes don't send out name refresh requests, see RFC 1001, 15.5.1 */
+    if (subrec != unicast_subnet)
+      continue;
+          
     for( namerec = (struct name_record *)ubi_trFirst( subrec->namelist );
          namerec;
          namerec = (struct name_record *)ubi_trNext( namerec ) )