Skip to content
This repository has been archived by the owner on Jan 22, 2018. It is now read-only.

Fix IPv6 Reverse Zone configuration. Bug#4553 #843

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions config/bind/bind.inc
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ EOD;
$zoneipslave = $zone['slaveip'];
$zoneforwarders=$zone['forwarders'];
$zonereverso = $zone['reverso'];
$zonereversv6o = $zone['reversv6o'];

if (!(is_dir(CHROOT_LOCALBASE."/etc/namedb/$zonetype/$zoneview")))
mkdir(CHROOT_LOCALBASE."/etc/namedb/$zonetype/$zoneview",0755,true);
Expand All @@ -337,7 +338,10 @@ EOD;

if ($zoneview == $viewname){
if($zonereverso == "on")
$bind_conf .= "\tzone \"$zonename.in-addr.arpa\" {\n";
if($zonereversv6o == "on")
$bind_conf .= "\tzone \"$zonename.ip6.arpa\" {\n";
else
$bind_conf .= "\tzone \"$zonename.in-addr.arpa\" {\n";
else
$bind_conf .= "\tzone \"$zonename\" {\n";

Expand Down Expand Up @@ -394,7 +398,8 @@ EOD;
$zoneminimum = ($zone['minimum']?$zone['minimum']:"3600");
$zonenameserver = $zone['nameserver'];
$zoneipns = $zone['ipns'];
$zonereverso = $zone['reverso'];
$zonereverso = $zone['reverso'];
$zonereversv6o = $zone['reversv6o'];
if($zone['allowupdate'] == '')
$zoneallowupdate = "none";
else
Expand All @@ -409,7 +414,10 @@ EOD;
$zoneallowtransfer = str_replace(',','; ',$zone['allowtransfer']);
$zone_conf = "\$TTL {$zonetll}\n;\n";
if($zonereverso == "on")
$zone_conf .= "\$ORIGIN {$zonename}.in-addr.arpa.\n\n";
if($zonereversv6o == "on")
$zone_conf .= "\$ORIGIN {$zonename}.ip6.arpa.\n\n";
else
$zone_conf .= "\$ORIGIN {$zonename}.in-addr.arpa.\n\n";
else
$zone_conf .= "\$ORIGIN {$zonename}.\n\n";
$zone_conf .= ";\tDatabase file {$zonename}.DB for {$zonename} zone.\n";
Expand Down
6 changes: 6 additions & 0 deletions config/bind/bind_zones.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@
<fieldname>reverso</fieldname>
<description>Enable if this is a reverse zone.</description>
<type>checkbox</type>
</field>
<field>
<fielddescr>IPV6 Reverse Zone</fielddescr>
<fieldname>reversv6o</fieldname>
<description>Enable if this is a IPV6 reverse zone. Evaluated only if Reverse Zone is also selected.</description>
<type>checkbox</type>
</field>
<field>
<fielddescr>Custom Option</fielddescr>
Expand Down