Merge pull request #2325 from stilez/patch-7

This commit is contained in:
Renato Botelho 2015-12-30 15:53:44 -02:00
commit dae9ce3f4e

View File

@ -403,15 +403,14 @@ if (isset($_POST['submit'])) {
$subnet_start = ip2ulong(long2ip32(ip2long($ifcfgip) & gen_subnet_mask_long($ifcfgsn)));
$subnet_end = ip2ulong(long2ip32(ip2long($ifcfgip) | (~gen_subnet_mask_long($ifcfgsn))));
if ((ip2ulong($_POST['range_from']) < $subnet_start) || (ip2ulong($_POST['range_from']) > $subnet_end) ||
(ip2ulong($_POST['range_to']) < $subnet_start) || (ip2ulong($_POST['range_to']) > $subnet_end)) {
$input_errors[] = gettext("The specified range lies outside of the current subnet.");
}
if (ip2ulong($_POST['range_from']) > ip2ulong($_POST['range_to'])) {
$input_errors[] = gettext("The range is invalid (first element higher than second element).");
}
if (ip2ulong($_POST['range_from']) < $subnet_start || ip2ulong($_POST['range_to']) > $subnet_end) {
$input_errors[] = gettext("The specified range lies outside of the current subnet.");
}
if (is_numeric($pool) || ($act == "newpool")) {
$rfrom = $config['dhcpd'][$if]['range']['from'];
$rto = $config['dhcpd'][$if]['range']['to'];