aboutsummaryrefslogtreecommitdiffstats
path: root/config/unbound/unbound.inc
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2011-12-19 21:57:52 +0200
committerWarren Baker <warren@decoy.co.za>2011-12-19 21:57:52 +0200
commit1f8a1167d89d56a2912e94fd3c540d358d44214e (patch)
tree350cf677d1ce459086d78ddf9af232dbfbd5c97a /config/unbound/unbound.inc
parent93c5ed2ff6f7600359528235d5b3160f33499537 (diff)
downloadpfsense-packages-1f8a1167d89d56a2912e94fd3c540d358d44214e.tar.gz
pfsense-packages-1f8a1167d89d56a2912e94fd3c540d358d44214e.tar.bz2
pfsense-packages-1f8a1167d89d56a2912e94fd3c540d358d44214e.zip
Fix check so rogue access-allow doesnt b0rg the config
Diffstat (limited to 'config/unbound/unbound.inc')
-rw-r--r--config/unbound/unbound.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc
index 292a2ae6..26109224 100644
--- a/config/unbound/unbound.inc
+++ b/config/unbound/unbound.inc
@@ -258,7 +258,7 @@ function unbound_get_network_interface_addresses() {
$unbound_interfaces[$i]['ipv4']['ipaddr'] = $interfaces[$unboundif]['ipaddr'];
$unbound_interfaces[$i]['ipv4']['subnet'] = $interfaces[$unboundif]['subnet'];
$unbound_interfaces[$i]['ipv4']['network'] = gen_subnet($unbound_interfaces[$i]['ipv4']['ipaddr'],$unbound_interfaces[$i]['ipv4']['subnet']);
-
+
// Check for CARP addresses and also return those - only IPv4 for now
if (isset($config['virtualip'])) {
if(is_array($config['virtualip']['vip'])) {
@@ -384,9 +384,8 @@ function unbound_acls_config() {
}
}
return $unboundcfg;
- } else {
+ } else
return;
- }
}
function unbound_resync_config() {
@@ -404,7 +403,7 @@ function unbound_resync_config() {
foreach($unboundnetcfg as $netent) {
foreach($netent as $entry) {
# If virtual interface then skip
- if (!$entry['network'] && $entry['subnet'])
+ if (!$entry['network'] && !$entry['subnet'])
continue;
$unbound_bind_interfaces .="interface: {$entry['ipaddr']}\n";
if($entry['ipaddr'] != "127.0.0.1" && $entry['ipaddr'] != "::1" )