summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@gmail.com>2011-07-10 12:04:34 -0400
committerScott Ullrich <sullrich@gmail.com>2011-07-10 12:04:34 -0400
commit45d1024db3d3d32fb26f2b6c42460cbe98e24096 (patch)
treed325e2bad2f1b5a57ab93970cdb89d46aa9b1376 /usr
parent7988ce7581efee9aef0184edfb2eeb2f352477a8 (diff)
downloadpfsense-45d1024db3d3d32fb26f2b6c42460cbe98e24096.zip
pfsense-45d1024db3d3d32fb26f2b6c42460cbe98e24096.tar.gz
Do not check to see if gateay falls within a null value. Resolves #1664
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/services_dhcp.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index 4045ead..17fbb80 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -217,10 +217,11 @@ if ($_POST) {
if (($_POST['wins1'] && !is_ipaddr($_POST['wins1'])) || ($_POST['wins2'] && !is_ipaddr($_POST['wins2'])))
$input_errors[] = gettext("A valid IP address must be specified for the primary/secondary WINS servers.");
$parent_ip = get_interface_ip($_POST['if']);
- if (is_ipaddr($parent_ip) && $_POST['gateway'])
+ if (is_ipaddr($parent_ip) && $_POST['gateway']) {
$parent_sn = get_interface_subnet($_POST['if']);
if(!ip_in_subnet($_POST['gateway'], gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn) && !ip_in_interface_alias_subnet($_POST['if'], $_POST['gateway']))
$input_errors[] = sprintf(gettext("The gateway address %s does not lie within the chosen interface's subnet."), $_POST['gateway']);
+ }
if (($_POST['dns1'] && !is_ipaddr($_POST['dns1'])) || ($_POST['dns2'] && !is_ipaddr($_POST['dns2'])))
$input_errors[] = gettext("A valid IP address must be specified for the primary/secondary DNS servers.");
OpenPOWER on IntegriCloud