From 51e4bb3731058eae7675c4cae886261ee2b74676 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 31 May 2006 23:29:35 +0000
Subject: [PATCH] Fix discover_bridge()

---
 etc/inc/interfaces.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 5fe0a8ab7d..fe3815fce8 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1502,6 +1502,7 @@ function discover_bridge($interface1, $interface2) {
 	if(!$interface1) return;
 	if(!$interface2) return;
 	$total_bridges = get_number_of_bridged_interfaces();
+	$total_bridges++;
 	$interfaces = `/sbin/ifconfig -l`;
 	$x=0;
 	for($x=0; $x<$total_bridges; $x++) {
@@ -1509,10 +1510,9 @@ function discover_bridge($interface1, $interface2) {
 		if(!stristr($interfaces, "bridge{$x}")) 
 			continue;
 		$bridge_text = `/sbin/ifconfig bridge{$x} | grep member`;
-		if(stristr($bridge_text, $interface1) == true and
-		   stristr($bridge_text, $interface2) == true) {
-			return "{$x}";			
-		}
+		if(stristr($bridge_text, $interface1))
+			if(stristr($bridge_text, $interface2))
+				return $x;
 	}
 	return "-1";
 }