summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-12-17 15:25:26 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-12-17 15:25:26 -0200
commite94692c09773126f2326294169b7b43d511d4ded (patch)
tree93aa0c53e20d4c78533b7049a1fbcd7bf27e63c3 /usr/local
parentc1476a2abb8965a92a52146773be59ade4547cfa (diff)
downloadpfsense-e94692c09773126f2326294169b7b43d511d4ded.zip
pfsense-e94692c09773126f2326294169b7b43d511d4ded.tar.gz
Do not check disabled interfaces, ticket #4119
Diffstat (limited to 'usr/local')
-rw-r--r--usr/local/www/services_dhcp_relay.php7
-rw-r--r--usr/local/www/services_dhcpv6_relay.php7
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) {
OpenPOWER on IntegriCloud