summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-12-23 14:40:09 -0200
committerRenato Botelho <garga@FreeBSD.org>2013-12-23 14:40:58 -0200
commitf2aa8287545d45ed22c44b5e2c102fb7a22658b0 (patch)
tree73f10a0e1bf3c990ec4e80b477f698b143615de8
parentdb817c937cb9477e7b64adea07c4139120cb7ba4 (diff)
downloadpfsense-f2aa8287545d45ed22c44b5e2c102fb7a22658b0.zip
pfsense-f2aa8287545d45ed22c44b5e2c102fb7a22658b0.tar.gz
Remove 'deny unknown clients' option from DHCPv6 since it's not supported, it fixes #3364
-rw-r--r--etc/inc/services.inc3
-rw-r--r--usr/local/www/services_dhcpv6.php10
2 files changed, 0 insertions, 13 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 012ee71..27f26e1 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1074,9 +1074,6 @@ EOD;
}
$dhcpdv6conf .= " {\n";
- if (isset($dhcpv6ifconf['denyunknown']))
- $dhcpdv6conf .= " deny unknown-clients;\n";
-
$dhcpdv6conf .= <<<EOD
range6 {$dhcpv6ifconf['range']['from']} {$dhcpv6ifconf['range']['to']};
$dnscfgv6
diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php
index e367ed6..45f99ee 100644
--- a/usr/local/www/services_dhcpv6.php
+++ b/usr/local/www/services_dhcpv6.php
@@ -108,7 +108,6 @@ if (is_array($config['dhcpdv6'][$if])){
list($pconfig['wins1'],$pconfig['wins2']) = $config['dhcpdv6'][$if]['winsserver'];
list($pconfig['dns1'],$pconfig['dns2']) = $config['dhcpdv6'][$if]['dnsserver'];
$pconfig['enable'] = isset($config['dhcpdv6'][$if]['enable']);
- $pconfig['denyunknown'] = isset($config['dhcpdv6'][$if]['denyunknown']);
$pconfig['ddnsdomain'] = $config['dhcpdv6'][$if]['ddnsdomain'];
$pconfig['ddnsupdate'] = isset($config['dhcpdv6'][$if]['ddnsupdate']);
list($pconfig['ntp1'],$pconfig['ntp2']) = $config['dhcpdv6'][$if]['ntpserver'];
@@ -293,7 +292,6 @@ if ($_POST) {
$config['dhcpdv6'][$if]['domain'] = $_POST['domain'];
$config['dhcpdv6'][$if]['domainsearchlist'] = $_POST['domainsearchlist'];
- $config['dhcpdv6'][$if]['denyunknown'] = ($_POST['denyunknown']) ? true : false;
$config['dhcpdv6'][$if]['enable'] = ($_POST['enable']) ? true : false;
$config['dhcpdv6'][$if]['ddnsdomain'] = $_POST['ddnsdomain'];
$config['dhcpdv6'][$if]['ddnsupdate'] = ($_POST['ddnsupdate']) ? true : false;
@@ -407,7 +405,6 @@ include("head.inc");
document.iform.nextserver.disabled = endis;
document.iform.filename.disabled = endis;
document.iform.rootpath.disabled = endis;
- document.iform.denyunknown.disabled = endis;
}
function show_shownumbervalue() {
@@ -529,13 +526,6 @@ display_top_tabs($tab_array);
"interface"),htmlspecialchars($iflist[$if]));?></strong></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vtable">&nbsp;</td>
- <td width="78%" class="vtable">
- <input name="denyunknown" id="denyunknown" type="checkbox" value="yes" <?php if ($pconfig['denyunknown']) echo "checked"; ?>>
- <strong><?=gettext("Deny unknown clients");?></strong><br>
- <?=gettext("If this is checked, only the clients defined below will get DHCP leases from this server. ");?></td>
- </tr>
- <tr>
<?php
/* the PPPoE Server could well have no IPv6 address and operate fine with just link-local, just hide these */
if(is_ipaddrv6($ifcfgip)) {
OpenPOWER on IntegriCloud