Merge pull request #1290 from jean-m-cyr/master

This commit is contained in:
Renato Botelho 2014-09-25 08:18:05 -03:00
commit e45e3bf48c

View File

@ -132,6 +132,9 @@ EOF;
$intip = get_interface_ip($ubif);
if (!is_null($intip))
$bindints .= "interface: $intip\n";
$intip = get_interface_ipv6($ubif);
if (!is_null($intip))
$bindints .= "interface: $intip\n";
}
} else {
$bindints .= "interface: 0.0.0.0\n";
@ -147,6 +150,9 @@ EOF;
$outip = get_interface_ip($outif);
if (!is_null($outip))
$outgoingints .= "outgoing-interface: $outip\n";
$outip = get_interface_ipv6($outif);
if (!is_null($outip))
$outgoingints .= "outgoing-interface: $outip\n";
}
}
@ -643,6 +649,12 @@ function unbound_acls_config() {
$subnet_ip = gen_subnet($ifip, $subnet_bits);
$aclcfg .= "access-control: {$subnet_ip}/{$subnet_bits} allow\n";
}
$ifip = get_interface_ipv6($ubif);
if (!is_null($ifip)) {
$subnet_bits = get_interface_subnetv6($ubif);
$subnet_ip = gen_subnetv6($ifip, $subnet_bits);
$aclcfg .= "access-control: {$subnet_ip}/{$subnet_bits} allow\n";
}
}
// Configure the custom ACLs