Changeset 204 for branches/samba-3.2.x/source/nmbd/nmbd_subnetdb.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/nmbd/nmbd_subnetdb.c (modified) (2 diffs)

branches/samba-3.2.x/source/nmbd/nmbd_subnetdb.c

@@ -196 +196 @@
 {
         /* We only count IPv4 interfaces whilst we're waiting. */
-        int num_interfaces = iface_count_v4();
+        int num_interfaces;
         int i;
         struct in_addr unicast_ip, ipzero;
@@ -202 +202 @@
   try_interfaces_again:
 
-        if (iface_count_v4() == 0) {
-                DEBUG(0,("create_subnets: No local interfaces !\n"));
+        /* Only count IPv4, non-loopback interfaces. */
+        if (iface_count_v4_nl() == 0) {
+                DEBUG(0,("create_subnets: No local IPv4 non-loopback interfaces !\n"));
                 DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
         }
 
-        /* We only count IPv4 interfaces here. */
-        while (iface_count_v4() == 0) {
+        /* We only count IPv4, non-loopback interfaces here. */
+        while (iface_count_v4_nl() == 0) {
                 void (*saved_handler)(int);