diff options
| -rwxr-xr-x | etc/rc.initial.setlanip | 14 | ||||
| -rwxr-xr-x | usr/local/www/interfaces.php | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index 774cda0..6bebf86 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -323,8 +323,8 @@ $config['interfaces'][$interface]['enable'] = true; function console_configure_dhcpd($version = 4) { global $g, $config, $restart_dhcpd, $fp, $interface, $dry_run; - $label_IPvX = ($version === 6) ? "IPv6" : "IPv4"; - $dhcpd = ($version === 6) ? "dhcpd6" : "dhcpd"; + $label_IPvX = ($version === 6) ? "IPv6" : "IPv4"; + $dhcpd = ($version === 6) ? "dhcpdv6" : "dhcpd"; if($g['services_dhcp_server_enable']) $yn = prompt_for_enable_dhcp_server($version); @@ -396,17 +396,17 @@ if($config['interfaces']['lan']) { if($config['dhcpd']) if($config['dhcpd']['wan']) unset($config['dhcpd']['wan']); - if($config['dhcpd6']) - if($config['dhcpd6']['wan']) - unset($config['dhcpd6']['wan']); + if($config['dhcpdv6']) + if($config['dhcpdv6']['wan']) + unset($config['dhcpdv6']['wan']); } if(!$config['interfaces']['lan']) { unset($config['interfaces']['lan']); if($config['dhcpd']['lan']) unset($config['dhcpd']['lan']); - if($config['dhcpd6']['lan']) - unset($config['dhcpd6']['lan']); + if($config['dhcpdv6']['lan']) + unset($config['dhcpdv6']['lan']); unset($config['shaper']); unset($config['ezshaper']); unset($config['nat']); diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 31a5272..cbda235 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -432,7 +432,7 @@ if ($_POST['apply']) { /* input validation */ if (isset($config['dhcpd']) && isset($config['dhcpd'][$if]['enable']) && (! preg_match("/^staticv4/", $_POST['type']))) $input_errors[] = gettext("The DHCP Server is active on this interface and it can be used only with a static IP configuration. Please disable the DHCP Server service on this interface first, then change the interface configuration."); - if (isset($config['dhcpd6']) && isset($config['dhcpd6'][$if]['enable']) && (! preg_match("/^staticv6/", $_POST['type6']))) + if (isset($config['dhcpdv6']) && isset($config['dhcpdv6'][$if]['enable']) && (! preg_match("/^staticv6/", $_POST['type6']))) $input_errors[] = gettext("The DHCP6 Server is active on this interface and it can be used only with a static IPv6 configuration. Please disable the DHCPv6 Server service on this interface first, then change the interface configuration."); switch(strtolower($_POST['type'])) { |
