Changeset 134 for branches/samba-3.0/source/nmbd/nmbd_subnetdb.c

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

File:

• branches/samba-3.0/source/nmbd/nmbd_subnetdb.c (modified) (3 diffs)

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

@@ -181 +181 @@
 BOOL create_subnets(void)
 {    
-        int num_interfaces = iface_count();
+        int num_interfaces;
         int i;
         struct in_addr unicast_ip, ipzero;
 
-        if(num_interfaces == 0) {
-                void (*saved_handler)(int);
-
+  try_interfaces_again:
+
+        if (iface_count() == 0) {
                 DEBUG(0,("create_subnets: No local interfaces !\n"));
                 DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
+        }
+
+        while (iface_count() == 0) {
+                void (*saved_handler)(int);
 
                 /* 
@@ -198 +202 @@
                 saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
 
-                while (iface_count() == 0) {
-                        sleep(5);
-                        load_interfaces();
-                }
+                sleep(5);
+                load_interfaces();
 
                 /* 
@@ -242 +244 @@
         /* We must have at least one subnet. */
         if (subnetlist == NULL) {
-                DEBUG(0,("create_subnets: unable to create any subnet from "
-                                "given interfaces. nmbd is terminating\n"));
-                return False;
+                void (*saved_handler)(int);
+
+                DEBUG(0,("create_subnets: Unable to create any subnet from "
+                                "given interfaces. Is your interface line in "
+                                "smb.conf correct ?\n"));
+
+                saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+
+                sleep(5);
+                load_interfaces();
+
+                CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+                goto try_interfaces_again;
         }