diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-12-17 15:25:26 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-17 15:27:02 -0200 |
| commit | a030a43720ff88465efc560ebc02145e9e0f2191 (patch) | |
| tree | 734bb2e05873a806241d388b8acdd1773c862550 /usr/local | |
| parent | 2ae99d06ce01d75a705c5c0e2563da4c24643343 (diff) | |
| download | pfsense-a030a43720ff88465efc560ebc02145e9e0f2191.zip pfsense-a030a43720ff88465efc560ebc02145e9e0f2191.tar.gz | |
Do not check disabled interfaces, ticket #4119
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/services_dhcp_relay.php | 7 | ||||
| -rw-r--r-- | usr/local/www/services_dhcpv6_relay.php | 7 |
2 files changed, 10 insertions, 4 deletions
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) { |
