Have nmbd check all available interfaces for WINS before failing

When nmbd is acting as WINS, it picks the first interface's IP as WINS
server's IP. If the first interface's IP is zero, we will just quit
(even though we might have other interfaces with valid IPs).

This patch makes nmbd look at all interfaces and pick the first interface
with a valid IP as the WINS server's IP.

diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index 48fa4d32a93a1e01669f17c623e592fa602287da..b32ccb9c56851d5f80b9bfbe9a03ed3ec17783b5 100644 (file)
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -151,7 +151,8 @@ int iface_count_v4_nl(void)
 }
 
 /****************************************************************************
- Return a pointer to the in_addr of the first IPv4 interface.
+ Return a pointer to the in_addr of the first IPv4 interface that's
+ not 0.0.0.0.
 **************************************************************************/
 
 const struct in_addr *first_ipv4_iface(void)
@@ -159,7 +160,9 @@ const struct in_addr *first_ipv4_iface(void)
        struct interface *i;
 
        for (i=local_interfaces;i ;i=i->next) {
-               if (i->ip.ss_family == AF_INET) {
+               if ((i->ip.ss_family == AF_INET) &&
+                   (!is_zero_ip_v4(((struct sockaddr_in *)&i->ip)->sin_addr)))
+               {
                        break;
                }
        }

diff --git a/source3/nmbd/nmbd_become_dmb.c b/source3/nmbd/nmbd_become_dmb.c
index a0b2ef15f8b804c6e2a2be874d3304969c6df84f..827d56cb0624393511d82a678fb6b30b2c320de2 100644 (file)
--- a/source3/nmbd/nmbd_become_dmb.c
+++ b/source3/nmbd/nmbd_become_dmb.c
@@ -128,7 +128,8 @@ in workgroup %s on subnet %s\n",
 
                work->dmb_name = nmbname;
 
-               /* Pick the first interface IPv4 address as the domain master browser ip. */
+               /* Pick the first interface IPv4 address as the domain master
+                * browser ip. */
                nip = first_ipv4_iface();
                if (!nip) {
                        DEBUG(0,("become_domain_master_stage2: "

diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c
index 61af0bb4a4d57d7b9c71251089b52fec740b9b18..13bc931863b47c07fcb99844cc1451464ea0a530 100644 (file)
--- a/source3/nmbd/nmbd_subnetdb.c
+++ b/source3/nmbd/nmbd_subnetdb.c
@@ -287,7 +287,8 @@ bool create_subnets(void)
        }
 
        if (lp_we_are_a_wins_server()) {
-               /* Pick the first interface IPv4 address as the WINS server ip. */
+               /* Pick the first interface IPv4 address as the WINS server
+                * ip. */
                const struct in_addr *nip = first_ipv4_iface();
 
                if (!nip) {