summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Nelson <robertn@the-nelsons.org>2015-03-26 11:48:54 -0700
committerRobert Nelson <robertn@the-nelsons.org>2015-03-26 11:48:54 -0700
commitea08d2b204daad5a89a7acb1045b11570d4127b2 (patch)
treeb4fae4a5236a8ad709883629f329e8c92aa48e5d
parent7db3d1c74348eed28cc84587bbd85c8c9a59261d (diff)
downloadpfsense-ea08d2b204daad5a89a7acb1045b11570d4127b2.zip
pfsense-ea08d2b204daad5a89a7acb1045b11570d4127b2.tar.gz
Change to Record Type with A and AAAA as values.
-rw-r--r--etc/inc/services.inc4
-rw-r--r--usr/local/www/services_rfc2136_edit.php16
2 files changed, 10 insertions, 10 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index ebea25b..3897506 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -2422,7 +2422,7 @@ EOD;
conf_mount_rw();
/* Update IPv4 if we have it. */
- if (is_ipaddrv4($wanip) && $dnsupdate['addresstypes'] != "ipv6") {
+ if (is_ipaddrv4($wanip) && $dnsupdate['recordtype'] != "AAAA") {
if (($wanip != $cachedipv4) || (($currentTime - $cacheTimev4) > $maxCacheAgeSecs) || $forced) {
$upinst .= "update delete {$dnsupdate['host']}. A\n";
$upinst .= "update add {$dnsupdate['host']}. {$dnsupdate['ttl']} A {$wanip}\n";
@@ -2438,7 +2438,7 @@ EOD;
}
/* Update IPv6 if we have it. */
- if (is_ipaddrv6($wanipv6) && $dnsupdate['addresstypes'] != "ipv4") {
+ if (is_ipaddrv6($wanipv6) && $dnsupdate['recordtype'] != "A") {
if (($wanipv6 != $cachedipv6) || (($currentTime - $cacheTimev6) > $maxCacheAgeSecs) || $forced) {
$upinst .= "update delete {$dnsupdate['host']}. AAAA\n";
$upinst .= "update add {$dnsupdate['host']}. {$dnsupdate['ttl']} AAAA {$wanipv6}\n";
diff --git a/usr/local/www/services_rfc2136_edit.php b/usr/local/www/services_rfc2136_edit.php
index 8e0b351..ffe446b 100644
--- a/usr/local/www/services_rfc2136_edit.php
+++ b/usr/local/www/services_rfc2136_edit.php
@@ -60,9 +60,9 @@ if (isset($id) && isset($a_rfc2136[$id])) {
$pconfig['interface'] = $a_rfc2136[$id]['interface'];
$pconfig['usetcp'] = isset($a_rfc2136[$id]['usetcp']);
$pconfig['usepublicip'] = isset($a_rfc2136[$id]['usepublicip']);
- $pconfig['addresstypes'] = $a_rfc2136[$id]['addresstypes'];
- if (!$pconfig['addresstypes'])
- $pconfig['addresstypes'] = "both";
+ $pconfig['recordtype'] = $a_rfc2136[$id]['recordtype'];
+ if (!$pconfig['recordtype'])
+ $pconfig['recordtype'] = "both";
$pconfig['descr'] = $a_rfc2136[$id]['descr'];
}
@@ -98,7 +98,7 @@ if ($_POST) {
$rfc2136['server'] = $_POST['server'];
$rfc2136['usetcp'] = $_POST['usetcp'] ? true : false;
$rfc2136['usepublicip'] = $_POST['usepublicip'] ? true : false;
- $rfc2136['addresstypes'] = $_POST['addresstypes'];
+ $rfc2136['recordtype'] = $_POST['recordtype'];
$rfc2136['interface'] = $_POST['interface'];
$rfc2136['descr'] = $_POST['descr'];
@@ -209,11 +209,11 @@ include("head.inc");
</td>
</tr>
<tr>
- <td valign="top" class="vncellreq"><?=gettext("Address Types");?> </td>
+ <td valign="top" class="vncellreq"><?=gettext("Record Type");?> </td>
<td class="vtable">
- <input name="addresstypes" type="radio" value="ipv4" <?php if ($pconfig['addresstypes'] == "ipv4") echo "checked=\"checked\""; ?> /> <?=gettext("IPv4");?> &nbsp;
- <input name="addresstypes" type="radio" value="ipv6" <?php if ($pconfig['addresstypes'] == "ipv6") echo "checked=\"checked\""; ?> /> <?=gettext("IPv6");?> &nbsp;
- <input name="addresstypes" type="radio" value="both" <?php if ($pconfig['addresstypes'] == "both") echo "checked=\"checked\""; ?> /> <?=gettext("Both");?>
+ <input name="recordtype" type="radio" value="A" <?php if ($pconfig['recordtype'] == "A") echo "checked=\"checked\""; ?> /> <?=gettext("A (IPv4)");?> &nbsp;
+ <input name="recordtype" type="radio" value="AAAA" <?php if ($pconfig['recordtype'] == "AAAA") echo "checked=\"checked\""; ?> /> <?=gettext("AAAA (IPv6)");?> &nbsp;
+ <input name="recordtype" type="radio" value="both" <?php if ($pconfig['recordtype'] == "both") echo "checked=\"checked\""; ?> /> <?=gettext("Both");?>
</td>
</tr>
<tr>
OpenPOWER on IntegriCloud