diff options
author | Chris Buechler <cmb@pfsense.org> | 2015-11-17 22:21:01 -0600 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2015-11-17 22:21:01 -0600 |
commit | 53436df6a7d0029698d4f89a36f25cbcc65be2d8 (patch) | |
tree | a12d60aa61519d12876f6ff54868395b30b793dc /src/usr | |
parent | 7ea6567421bd9912b842b1e4a4ff73e73ff3e693 (diff) | |
download | pfsense-53436df6a7d0029698d4f89a36f25cbcc65be2d8.zip pfsense-53436df6a7d0029698d4f89a36f25cbcc65be2d8.tar.gz |
radvd only allows 3 RDNSS servers to be specified, otherwise exits with "too many addresses in RDNSS section".
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/services_router_advertisements.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index f1e2423..d0e1a49 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -124,7 +124,7 @@ if (is_array($config['dhcpdv6'][$if])) { } $pconfig['rainterface'] = $config['dhcpdv6'][$if]['rainterface']; $pconfig['radomainsearchlist'] = $config['dhcpdv6'][$if]['radomainsearchlist']; - list($pconfig['radns1'], $pconfig['radns2'], $pconfig['radns3'], $pconfig['radns4']) = $config['dhcpdv6'][$if]['radnsserver']; + list($pconfig['radns1'], $pconfig['radns2'], $pconfig['radns3']) = $config['dhcpdv6'][$if]['radnsserver']; $pconfig['rasamednsasdhcp6'] = isset($config['dhcpdv6'][$if]['rasamednsasdhcp6']); $pconfig['subnets'] = $config['dhcpdv6'][$if]['subnets']['item']; @@ -179,7 +179,7 @@ if ($_POST) { } } - if (($_POST['radns1'] && !is_ipaddrv6($_POST['radns1'])) || ($_POST['radns2'] && !is_ipaddrv6($_POST['radns2'])) || ($_POST['radns3'] && !is_ipaddrv6($_POST['radns3'])) || ($_POST['radns4'] && !is_ipaddrv6($_POST['radns4']))) { + if (($_POST['radns1'] && !is_ipaddrv6($_POST['radns1'])) || ($_POST['radns2'] && !is_ipaddrv6($_POST['radns2'])) || ($_POST['radns3'] && !is_ipaddrv6($_POST['radns3']))) { $input_errors[] = gettext("A valid IPv6 address must be specified for each of the DNS servers."); } if ($_POST['radomainsearchlist']) { @@ -212,9 +212,6 @@ if ($_POST) { if ($_POST['radns3']) { $config['dhcpdv6'][$if]['radnsserver'][] = $_POST['radns3']; } - if ($_POST['radns4']) { - $config['dhcpdv6'][$if]['radnsserver'][] = $_POST['radns4']; - } $config['dhcpdv6'][$if]['rasamednsasdhcp6'] = ($_POST['rasamednsasdhcp6']) ? true : false; @@ -373,12 +370,12 @@ $form->add($section); $section = new Form_Section('DNS Configuration'); -for($idx=1; $idx<=4; $idx++) { +for($idx=1; $idx<=3; $idx++) { $section->addInput(new Form_IpAddress( 'radns' . $idx, 'Server ' . $idx, $pconfig['radns' . $idx] - ))->setPattern('[0-9, a-z, A-Z and .')->setHelp(($idx < 4) ? '':'Leave blank to use the system default DNS servers - this interface\'s IP if DNS Forwarder or Resolver is enabled, otherwise the servers configured on the General page'); + ))->setPattern('[0-9, a-z, A-Z and .')->setHelp(($idx < 3) ? '':'Leave blank to use the system default DNS servers - this interface\'s IP if DNS Forwarder or Resolver is enabled, otherwise the servers configured on the General page'); } $section->addInput(new Form_Input( @@ -416,7 +413,7 @@ events.push(function(){ // --------- Autocomplete ----------------------------------------------------------------------------------------- var addressarray = <?= json_encode(get_alias_list(array("host", "network", "openvpn", "urltable"))) ?>; - $('#radns1, #radns2, #radns3, #radns4').autocomplete({ + $('#radns1, #radns2, #radns3').autocomplete({ source: addressarray }); |