diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2008-02-16 02:16:37 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2008-02-16 02:16:37 +0000 |
commit | 3faf822da1b7775c331f19438063a9947c3e8ae1 (patch) | |
tree | abfe1252016973eb1b7b44f65224ba7c4ee8b877 /etc/rc.initial.setlanip | |
parent | 695b058058f5fe5a588c4d06a188962f20a74725 (diff) | |
download | pfsense-3faf822da1b7775c331f19438063a9947c3e8ae1.zip pfsense-3faf822da1b7775c331f19438063a9947c3e8ae1.tar.gz |
Correct MISC errors found by Scott Dale.
Diffstat (limited to 'etc/rc.initial.setlanip')
-rwxr-xr-x | etc/rc.initial.setlanip | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index 2803c23..8201c1c 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -33,7 +33,6 @@ /* parse the configuration and include all functions used below */ require_once("config.inc"); require_once("functions.inc"); - require_once("IPv6.inc"); $fp = fopen('php://stdin', 'r'); $addr_blank = false; @@ -102,9 +101,7 @@ $config['interfaces'][$interface]['ipaddr'] = $intip; $config['interfaces'][$interface]['subnet'] = $intbits; - $config['interfaces'][$interface]['ipaddr_ipv6'] = $intip_ipv6; - $config['interfaces'][$interface]['subnet_ipv6'] = $intbits_ipv6; - + if($interface <> "wan") { do { $good = false; @@ -126,7 +123,7 @@ fclose($fp); exit(0); } - } while (!(is_ipaddr($dhcpstartip) || Net_IPv6::checkIPv6($dhcpstartip))); + } while (!(is_ipaddr($dhcpstartip))); do { echo gettext("Enter the end address of the client address range:") . " "; @@ -135,7 +132,7 @@ fclose($fp); exit(0); } - } while (!(is_ipaddr($dhcpendip) || Net_IPv6::checkIPv6($dhcpendip))); + } while (!(is_ipaddr($dhcpendip))); $config['dhcpd'][$interface]['enable'] = true; $config['dhcpd'][$interface]['range']['from'] = $dhcpstartip; @@ -167,7 +164,7 @@ unset($config['dhcpd']['wan']); } - if(!$config['interfaces']['lan']) + if(!$config['interfaces']['lan']) { unset($config['interfaces']['lan']); unset($config['dhcpd']['lan']); unset($config['shaper']); @@ -186,12 +183,6 @@ echo "{$config['system']['webgui']['protocol']}://{$intip}/\n"; } - if ($intip_ipv6 != '') { - echo "\n" . gettext('The IPv6 {$interface} address has been set to ') . "{$intip_ipv6}/{$intbits_ipv6}\n" ; - echo gettext('You can now access the webConfigurator by opening the following URL in your web browser:') . "\n"; - echo "{$config['system']['webgui']['protocol']}://[{$intip_ipv6}]/\n"; - } - echo "\n" . gettext('Press <ENTER> to continue.'); fgets($fp); |