Fix bug 5697 nmbd spins in reload_interfaces when only loopback has an IPv4 address

reported by Ted Percival <ted@midg3t.net>.
Jeremy.

diff --git a/source/include/proto.h b/source/include/proto.h
index db1adb64eec57988b351685dddcf5d9f8a255079..3d0d419022eb4143363b823ab8f115e86220f459 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -623,7 +623,7 @@ bool is_local_net(const struct sockaddr_storage *from);
 void setup_linklocal_scope_id(struct sockaddr_storage *pss);
 bool is_local_net_v4(struct in_addr from);
 int iface_count(void);
-int iface_count_v4(void);
+int iface_count_v4_nl(void);
 const struct in_addr *first_ipv4_iface(void);
 struct interface *get_interface(int n);
 const struct sockaddr_storage *iface_n_sockaddr_storage(int n);

diff --git a/source/lib/interface.c b/source/lib/interface.c
index eb0af9ef341d85edcad4f5040738f98cc9cc6fef..2e7c2706a0699628df778715c03f7b8257fc5893 100644 (file)
--- a/source/lib/interface.c
+++ b/source/lib/interface.c
@@ -131,15 +131,18 @@ int iface_count(void)
 }
 
 /****************************************************************************
- How many interfaces do we have (v4 only) ?
+ How many non-loopback IPv4 interfaces do we have ?
 **************************************************************************/
 
-int iface_count_v4(void)
+int iface_count_v4_nl(void)
 {
        int ret = 0;
        struct interface *i;
 
        for (i=local_interfaces;i;i=i->next) {
+               if (is_loopback_addr(&i->ip)) {
+                       continue;
+               }
                if (i->ip.ss_family == AF_INET) {
                        ret++;
                }

diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index 83005f05bda8a6cee9250d20a0f9d69d9555a971..d9f2af4c10bdf2ec6e67ec9910fab6804c35646a 100644 (file)
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -296,8 +296,8 @@ static void reload_interfaces(time_t t)
 
                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();
                }

diff --git a/source/nmbd/nmbd_subnetdb.c b/source/nmbd/nmbd_subnetdb.c
index a4422d27d573541490c721c8f97e4ca044ceb776..225def52cced2c84ea2bc3f7ed746b71e77d765e 100644 (file)
--- a/source/nmbd/nmbd_subnetdb.c
+++ b/source/nmbd/nmbd_subnetdb.c
@@ -195,19 +195,20 @@ struct subnet_record *make_normal_subnet(const struct interface *iface)
 bool create_subnets(void)
 {
        /* 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;
 
   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);
 
                /*