summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@world.inf.org>2013-12-09 03:07:04 -0800
committerPhil Davis <phil.davis@world.inf.org>2013-12-09 03:07:04 -0800
commit5a997d96b283ae03b18d801f7ade980f331c9ce2 (patch)
tree3695fd712581c7e56328d4d10b66f515491a17c5
parent12f5a2d86107081678e73f642efa335c1e70d774 (diff)
downloadpfsense-5a997d96b283ae03b18d801f7ade980f331c9ce2.zip
pfsense-5a997d96b283ae03b18d801f7ade980f331c9ce2.tar.gz
Use correct vars for IPv6 when checking subnet start and end
-rwxr-xr-xetc/rc.initial.setlanip6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index b6ddc9e..13a9bdc 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -349,7 +349,7 @@ $config['interfaces'][$interface]['gatewayv6'] = $gwname6;
$config['interfaces'][$interface]['enable'] = true;
function console_configure_dhcpd($version = 4) {
- global $g, $config, $restart_dhcpd, $fp, $interface, $dry_run, $intip, $intbits;
+ global $g, $config, $restart_dhcpd, $fp, $interface, $dry_run, $intip, $intbits, $intip6, $intbits6;
$label_IPvX = ($version === 6) ? "IPv6" : "IPv4";
$dhcpd = ($version === 6) ? "dhcpdv6" : "dhcpd";
@@ -357,8 +357,8 @@ function console_configure_dhcpd($version = 4) {
if($g['services_dhcp_server_enable'])
$yn = prompt_for_enable_dhcp_server($version);
if ($yn == "y") {
- $subnet_start = ($version === 6) ? gen_subnetv6($intip, $intbits) : gen_subnet($intip, $intbits);
- $subnet_end = ($version === 6) ? gen_subnetv6_max($intip, $intbits) : gen_subnet_max($intip, $intbits);
+ $subnet_start = ($version === 6) ? gen_subnetv6($intip6, $intbits6) : gen_subnet($intip, $intbits);
+ $subnet_end = ($version === 6) ? gen_subnetv6_max($intip6, $intbits6) : gen_subnet_max($intip, $intbits);
do {
do {
echo sprintf(gettext("Enter the start address of the %s client address range:"), $label_IPvX) . " ";
OpenPOWER on IntegriCloud