Author: jra
Date: 2007-04-10 20:35:30 +0000 (Tue, 10 Apr 2007)
New Revision: 22157

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22157

Log:
Fix bug #3634 - stop nmbd segfaulting with bad interface line.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c
   branches/SAMBA_3_0_25/source/nmbd/nmbd_subnetdb.c


Changeset:
Modified: branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c
===================================================================
--- branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c      2007-04-10 20:19:31 UTC 
(rev 22156)
+++ branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c      2007-04-10 20:35:30 UTC 
(rev 22157)
@@ -223,6 +223,13 @@
                        return False;
        }
 
+        /* 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;
+       }
+
        if (lp_we_are_a_wins_server()) {
                /* Pick the first interface ip address as the WINS server ip. */
                struct in_addr *nip = iface_n_ip(0);

Modified: branches/SAMBA_3_0_25/source/nmbd/nmbd_subnetdb.c
===================================================================
--- branches/SAMBA_3_0_25/source/nmbd/nmbd_subnetdb.c   2007-04-10 20:19:31 UTC 
(rev 22156)
+++ branches/SAMBA_3_0_25/source/nmbd/nmbd_subnetdb.c   2007-04-10 20:35:30 UTC 
(rev 22157)
@@ -223,6 +223,13 @@
                        return False;
        }
 
+        /* 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;
+       }
+
        if (lp_we_are_a_wins_server()) {
                /* Pick the first interface ip address as the WINS server ip. */
                struct in_addr *nip = iface_n_ip(0);

Reply via email to