From e94692c09773126f2326294169b7b43d511d4ded Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Wed, 17 Dec 2014 15:25:26 -0200 Subject: Do not check disabled interfaces, ticket #4119 --- usr/local/www/services_dhcp_relay.php | 7 +++++-- usr/local/www/services_dhcpv6_relay.php | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'usr') diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index e0c2212..15fdd0f 100644 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -57,9 +57,12 @@ $iflist = get_configured_interface_with_descr(); */ $dhcpd_enabled = false; if (is_array($config['dhcpd'])) { - foreach($config['dhcpd'] as $dhcp) - if (isset($dhcp['enable'])) + foreach($config['dhcpd'] as $dhcpif => $dhcp) { + if (isset($dhcp['enable']) && isset($config['interfaces'][$dhcpif]['enable'])) { $dhcpd_enabled = true; + break; + } + } } if ($_POST) { diff --git a/usr/local/www/services_dhcpv6_relay.php b/usr/local/www/services_dhcpv6_relay.php index d01094c..8e80bca 100644 --- a/usr/local/www/services_dhcpv6_relay.php +++ b/usr/local/www/services_dhcpv6_relay.php @@ -58,9 +58,12 @@ $iflist = get_configured_interface_with_descr(); */ $dhcpd_enabled = false; if (is_array($config['dhcpdv6'])) { - foreach($config['dhcpdv6'] as $dhcp) - if (isset($dhcp['enable'])) + foreach($config['dhcpdv6'] as $dhcp) { + if (isset($dhcp['enable']) && isset($config['interfaces'][$dhcpif]['enable'])) { $dhcpd_enabled = true; + break; + } + } } if ($_POST) { -- cgit v1.1