dhcp: convert the last two #4749

This commit is contained in:
Franco Fichtner 2022-02-02 21:49:17 +01:00
parent 33a2818722
commit 934f40bbd9
2 changed files with 2 additions and 2 deletions

View File

@ -174,7 +174,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if ((!empty($pconfig['wins1']) && !is_ipaddrv4($pconfig['wins1'])) || (!empty($pconfig['wins2']) && !is_ipaddrv4($pconfig['wins2']))) {
$input_errors[] = gettext("A valid IP address must be specified for the primary/secondary WINS servers.");
}
$parent_net = find_interface_network(get_real_interface($pconfig['if']));
list ($unused, $parent_net) = interfaces_primary_address($pconfig['if']);
if (is_subnetv4($parent_net) && $pconfig['gateway'] && $pconfig['gateway'] != "none") {
if (!ip_in_subnet($pconfig['gateway'], $parent_net) && !ip_in_interface_alias_subnet($pconfig['if'], $pconfig['gateway'])) {
$input_errors[] = sprintf(gettext("The gateway address %s does not lie within the chosen interface's subnet."), $pconfig['gateway']);

View File

@ -155,7 +155,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
}
$parent_net = find_interface_network(get_real_interface($if));
list ($unused, $parent_net) = interfaces_primary_address($if);
if (!empty($pconfig['ipaddr'])) {
if (!ip_in_subnet($pconfig['ipaddr'], $parent_net)) {