summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2013-07-23 00:37:19 -0700
committerErmal Luçi <eri@pfsense.org>2013-07-23 00:37:19 -0700
commit338ade402396c68dec61762a01bdca5cd298be3c (patch)
tree9d968b7d9a0a4c019c246e464cd9ca0b19a67b55
parenta7b495403c5aa55342685fb5a29ba2c0ba6063ee (diff)
parentaf49447af3f45a675fb7b7c745e3490979c047fe (diff)
downloadpfsense-338ade402396c68dec61762a01bdca5cd298be3c.zip
pfsense-338ade402396c68dec61762a01bdca5cd298be3c.tar.gz
Merge pull request #723 from phil-davis/RELENG_2_1
Fix error in 2.1 branch dhcp6prefixonly implementation
-rwxr-xr-xusr/local/www/interfaces.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 2ea43e1..cbb0642 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -876,8 +876,6 @@ if ($_POST['apply']) {
if ($_POST['gatewayv6'] != "none") {
$wancfg['gatewayv6'] = $_POST['gatewayv6'];
}
- if($_POST['dhcp6prefixonly'] == "yes")
- $wancfg['dhcp6prefixonly'] = true;
break;
case "slaac":
$wancfg['ipaddrv6'] = "slaac";
@@ -886,6 +884,8 @@ if ($_POST['apply']) {
$wancfg['ipaddrv6'] = "dhcp6";
$wancfg['dhcp6-duid'] = $_POST['dhcp6-duid'];
$wancfg['dhcp6-ia-pd-len'] = $_POST['dhcp6-ia-pd-len'];
+ if($_POST['dhcp6prefixonly'] == "yes")
+ $wancfg['dhcp6prefixonly'] = true;
if($gateway_item) {
$a_gateways[] = $gateway_item;
}
OpenPOWER on IntegriCloud