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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

Location:

branches/samba-3.2.x/source/nmbd

Files:

• nmbd.c (modified) (1 diff)
• nmbd_processlogon.c (modified) (1 diff)
• nmbd_subnetdb.c (modified) (2 diffs)

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

@@ -294 +294 @@
                 BlockSignals(false, SIGTERM);
 
-                /* We only count IPv4 interfaces here. */
-                while (iface_count_v4() == 0 && !got_sig_term) {
+                /* We only count IPv4, non-loopback interfaces here. */
+                while (iface_count_v4_nl() == 0 && !got_sig_term) {
                         sleep(5);
                         load_interfaces();

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

@@ -400 +400 @@
                                         char *q_orig = q;
                                         int str_offset;
-                                        char *saveptr;
+                                        char *saveptr = NULL;
 
                                         domain = get_mydnsdomname(talloc_tos());

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);