Guard against interfaces without set address

zentyal · Mar 6, 2013 · 6302bec · 6302bec
1 parent 53839a1
commit 6302bec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/main/dns/ChangeLog b/main/dns/ChangeLog
@@ -1,4 +1,5 @@
 HEAD
+	+ Guard against interfaces without set address
 	+ Rename domain if exists when changing it in System -> General
 	+ Remove depends on users and samba to avoid deep recursion
 	+ Use API to retrieve foreign model value

diff --git a/main/dns/src/EBox/DNS.pm b/main/dns/src/EBox/DNS.pm
@@ -978,7 +978,15 @@ sub _intnets
     my @intnets = ();
 
     if (defined($intnets_string)) {
+        $intnets_string = s/\s//g;
         @intnets = split(',', $intnets_string);
+        my $cidrName = __x('Value from {key} in configuration file {conf}',
+                           key => DNS_INTNETS,
+                           value => DNS_CONF_FILE,
+                          );
+        foreach my $net (@intnets) {
+            EBox::Validate::checkCIDR($net, $cidrName);
+        }
     }
 
     return \@intnets;
@@ -991,9 +999,13 @@ sub _internalLocalNets
     my @localNets = map {
         my $iface = $_;
         my $net  = $network->ifaceNetwork($iface);
-        my $fullmask = $network->ifaceNetmask($iface);
-        my $mask = EBox::NetWrappers::bits_from_mask($fullmask);
-        ("$net/$mask");
+        if ($net) {
+            my $fullmask = $network->ifaceNetmask($iface);
+            my $mask = EBox::NetWrappers::bits_from_mask($fullmask);
+            ("$net/$mask");
+        } else {
+            ()
+        }
     } @{ $network->InternalIfaces };
     return \@localNets;
 }