From 934f40bbd9258f1d37b0fbfb68b4720b01df6f52 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 2 Feb 2022 21:49:17 +0100 Subject: [PATCH] dhcp: convert the last two #4749 --- src/www/services_dhcp.php | 2 +- src/www/services_dhcp_edit.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php index a8dfb1807..a0bece540 100644 --- a/src/www/services_dhcp.php +++ b/src/www/services_dhcp.php @@ -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']); diff --git a/src/www/services_dhcp_edit.php b/src/www/services_dhcp_edit.php index 40f070562..97478f892 100644 --- a/src/www/services_dhcp_edit.php +++ b/src/www/services_dhcp_edit.php @@ -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)) {