Changeset 124 for branches/samba-3.0/source/nmbd

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

Location:

branches/samba-3.0/source/nmbd

Files:

• nmbd.c (modified) (8 diffs)
• nmbd_namelistdb.c (modified) (1 diff)
• nmbd_nameregister.c (modified) (2 diffs)
• nmbd_packets.c (modified) (2 diffs)
• nmbd_responserecordsdb.c (modified) (3 diffs)

branches/samba-3.0/source/nmbd/nmbd.c

@@ -151 +151 @@
 /************************************************************************** **
  Reload the list of network interfaces.
+ Doesn't return until a network interface is up.
  ************************************************************************** */
 
-static BOOL reload_interfaces(time_t t)
+static void reload_interfaces(time_t t)
 {
         static time_t lastt;
@@ -159 +160 @@
         struct subnet_record *subrec;
 
-        if (t && ((t - lastt) < NMBD_INTERFACES_RELOAD)) return False;
+        if (t && ((t - lastt) < NMBD_INTERFACES_RELOAD)) {
+                return;
+        }
         lastt = t;
 
-        if (!interfaces_changed()) return False;
+        if (!interfaces_changed()) {
+                return;
+        }
 
         /* the list of probed interfaces has changed, we may need to add/remove
            some subnets */
         load_interfaces();
+
+  try_again:
 
         /* find any interfaces that need adding */
@@ -222 +229 @@
                 }
         }
-        
+
         rescan_listen_set = True;
 
-        /* We need to shutdown if there are no subnets... */
+        /* We need to wait if there are no subnets... */
         if (FIRST_SUBNET == NULL) {
-                DEBUG(0,("reload_interfaces: No subnets to listen to. Shutting down...\n"));
-                return True;
-        }
-        return False;
+                void (*saved_handler)(int);
+
+                DEBUG(0,("reload_interfaces: "
+                        "No subnets to listen to. Waiting..\n"));
+
+                /*
+                 * Whilst we're waiting for an interface, allow SIGTERM to
+                 * cause us to exit.
+                 */
+
+                saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+
+                while (iface_count() == 0) {
+                        sleep(5);
+                        load_interfaces();
+                }
+
+                /*
+                 * We got an interface, restore our normal term handler.
+                 */
+
+                CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+                goto try_again;
+        }
 }
 
@@ -268 +295 @@
 /**************************************************************************** **
  * React on 'smbcontrol nmbd reload-config' in the same way as to SIGHUP
- * We use buf here to return BOOL result to process() when reload_interfaces()
- * detects that there are no subnets.
  **************************************************************************** */
 
@@ -279 +304 @@
         reload_nmbd_services( True );
         reopen_logs();
-        
-        if(buf) {
-                /* We were called from process() */
-                /* If reload_interfaces() returned True */
-                /* we need to shutdown if there are no subnets... */
-                /* pass this info back to process() */
-                *((BOOL*)buf) = reload_interfaces(0);  
-        }
+        reload_interfaces(0);
 }
 
@@ -349 +367 @@
 {
         BOOL run_election;
-        BOOL no_subnets;
 
         while( True ) {
@@ -559 +576 @@
                         DEBUG( 0, ( "Got SIGHUP dumping debug info.\n" ) );
                         msg_reload_nmbd_services(MSG_SMB_CONF_UPDATED,
-                                                 pid_to_procid(0), (void*) &no_subnets, 0, NULL);
-                        if(no_subnets)
-                                return;
+                                                 pid_to_procid(0), NULL, 0, NULL);
                         reload_after_sighup = 0;
                 }
@@ -567 +582 @@
                 /* check for new network interfaces */
 
-                if(reload_interfaces(t))
-                        return;
+                reload_interfaces(t);
 
                 /* free up temp memory */
-                        lp_TALLOC_FREE();
+                lp_TALLOC_FREE();
         }
 }

branches/samba-3.0/source/nmbd/nmbd_namelistdb.c

@@ -295 +295 @@
 
 void standard_fail_register( struct subnet_record   *subrec,
-                             struct response_record *rrec,
                              struct nmb_name        *nmbname )
 {

branches/samba-3.0/source/nmbd/nmbd_nameregister.c

@@ -154 +154 @@
                         (*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, answer_name, nb_flags, ttl, register_ip);
         } else {
+                struct nmb_name qname = *question_name;
                 if( rrec->fail_fn)
                         (*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name);
                 /* Remove the name. */
-                standard_fail_register( subrec, rrec, question_name);
+                standard_fail_register( subrec, &qname);
         }
 
@@ -282 +283 @@
                         (*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip);
         } else {
+                struct nmb_name qname = *question_name;
                 if( rrec->fail_fn)
                         (*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name);
                 /* Remove the name. */
-                standard_fail_register( subrec, rrec, question_name);
+                standard_fail_register( subrec, &qname);
         }
 

branches/samba-3.0/source/nmbd/nmbd_packets.c

@@ -1607 +1607 @@
                 struct response_record *rrec, *nextrrec;
 
+  restart:
+
                 for (rrec = subrec->responselist; rrec; rrec = nextrrec) {
                         nextrrec = rrec->next;
@@ -1645 +1647 @@
                                                         remove_response_record(subrec, rrec);
                                                 }
+                                                /* We have changed subrec->responselist,
+                                                 * restart from the beginning of this list. */
+                                                goto restart;
                                         } /* !rrec->in_expitation_processing */
                                 } /* rrec->repeat_count > 0 */

branches/samba-3.0/source/nmbd/nmbd_responserecordsdb.c

@@ -33 +33 @@
                                 struct response_record *rrec)
 {
-        struct response_record *rrec2;
-
         num_response_packets++; /* count of total number of packets still around */
 
@@ -40 +38 @@
                 rrec->response_id, subrec->subnet_name, num_response_packets));
 
-        if (!subrec->responselist) {
-                subrec->responselist = rrec;
-                rrec->prev = NULL;
-                rrec->next = NULL;
-                return;
-        }
-  
-        for (rrec2 = subrec->responselist; rrec2->next; rrec2 = rrec2->next) 
-                ;
-  
-        rrec2->next = rrec;
-        rrec->next = NULL;
-        rrec->prev = rrec2;
+        DLIST_ADD_END(subrec->responselist, rrec, struct response_record *);
 }
 
@@ -62 +48 @@
                                 struct response_record *rrec)
 {
-        if (rrec->prev)
-                rrec->prev->next = rrec->next;
-        if (rrec->next)
-                rrec->next->prev = rrec->prev;
-
-        if (subrec->responselist == rrec) 
-                subrec->responselist = rrec->next; 
+        /* It is possible this can be called twice,
+           with a rrec pointer that has been freed. So
+           before we inderect into rrec, search for it
+           on the responselist first. Bug #3617. JRA. */
+
+        struct response_record *p = NULL;
+
+        for (p = subrec->responselist; p; p = p->next) {
+                if (p == rrec) {
+                        break;
+                }
+        }
+
+        if (p == NULL) {
+                /* We didn't find rrec on the list. */
+                return;
+        }
+
+        DLIST_REMOVE(subrec->responselist, rrec);
 
         if(rrec->userdata) {