From ca5722042f8498b7cc5852c0906dd9cdfa8644ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Sun, 31 Aug 2008 15:13:32 +0000
Subject: Fix detection if an interface is part of bridge.

---
 etc/inc/pfsense-utils.inc |  4 ++--
 etc/inc/services.inc      | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 0f5308a..be4645e 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -3430,9 +3430,9 @@ function is_dhcp_server_enabled() {
 	$dhcpdcfg = $config['dhcpd'];
 	$dhcpdenable = false;
 	foreach ($dhcpdcfg as $dhcpif => $dhcpifconf) {
-		if (isset ($dhcpifconf['enable']) && (($dhcpif == "lan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
+		if (isset ($dhcpifconf['enable']) && (($dhcpif == "lan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!link_int_to_bridge_interface($dhcpif)))))
 			$dhcpdenable = true;
-		if (isset ($dhcpifconf['enable']) && (($dhcpif == "wan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
+		if (isset ($dhcpifconf['enable']) && (($dhcpif == "wan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!link_int_to_bridge_interface($dhcpif)))))
 			$dhcpdenable = true;
 	}
 	return $dhcpdenable;
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index ac796a8..09ad5dd 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -90,11 +90,11 @@ function services_dhcpd_configure() {
 			if (isset($dhcpifconf['enable']) &&
 				(($dhcpif == "lan") ||
 				(isset($config['interfaces'][$dhcpif]['enable']) &&
-				$config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
+				$config['interfaces'][$dhcpif]['if'] && (!link_int_to_bridge_interface($dhcpif)))))
 				$dhcpdenable = true;
 			if (isset($dhcpifconf['enable']) &&
 				(($dhcpif == "wan") || (isset($config['interfaces'][$dhcpif]['enable']) &&
-				$config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
+				$config['interfaces'][$dhcpif]['if'] && (!link_int_to_bridge_interface($dhcpif)))))
 				$dhcpdenable = true;
 		}
 
@@ -201,10 +201,11 @@ EOPP;
 		if (!isset($dhcpifconf['enable']) ||
 			($ifcfg['ipaddr'] == "dhcp") ||
 			(($dhcpif != "lan") &&
-			(!isset($ifcfg['enable']) || !$ifcfg['if'] || $ifcfg['bridge'])))
+			(!isset($ifcfg['enable']) || !$ifcfg['if'] || 
+			link_int_to_bridge_interface($dhcpif))))
 			continue;
 
-		if($dhcpif == "lan" && $ifcfg['bridge'])
+		if($dhcpif == "lan" && link_int_to_bridge_interface($dhcpif))
 			log_error("NOTE: DHCP Server on LAN is enabled.");
 
 		$subnet = gen_subnet($ifcfg['ipaddr'], $ifcfg['subnet']);
@@ -397,7 +398,7 @@ function services_dhcrelay_configure() {
 			if (isset($dhcrelayifconf['enable']) &&
 				(($dhcrelayif == "lan") ||
 				(isset($config['interfaces'][$dhcrelayif]['enable']) &&
-				$config['interfaces'][$dhcrelayif]['if'] && (!$config['interfaces'][$dhcrelayif]['bridge']))))
+				$config['interfaces'][$dhcrelayif]['if'] && (!link_int_to_bridge_interface($dhcrelayif)))))
 				$dhcrelayenable = true;
 		}
 	}
@@ -417,7 +418,8 @@ function services_dhcrelay_configure() {
 
 		if (!isset($dhcrelayifconf['enable']) ||
 			(($dhcrelayif != "lan") &&
-			(!isset($ifcfg['enable']) || !$ifcfg['if'] || $ifcfg['bridge'])))
+			(!isset($ifcfg['enable']) || !$ifcfg['if'] || 
+			link_int_to_bridge_interface($dhcrelayif))))
 			continue;
 
 		$dhcrelayifs[] = $ifcfg['if'];
-- 
cgit v1.1