From 0b0ea92cb23d7bdfbce0aaf03c9f96f63a28d7e4 Mon Sep 17 00:00:00 2001 From: Erik Fonnesbeck Date: Wed, 24 Feb 2010 12:12:23 -0700 Subject: [PATCH 1/2] Revert "Fix the check for whether the bridge is assigned." This reverts commit 3a669df20b0795b2e487fc033f86eacea7e6fdf4. --- usr/local/www/interfaces_bridge.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php index 8cb8bda..2806005 100644 --- a/usr/local/www/interfaces_bridge.php +++ b/usr/local/www/interfaces_bridge.php @@ -46,12 +46,12 @@ if (!is_array($config['bridges']['bridged'])) $a_bridges = &$config['bridges']['bridged'] ; -function bridge_inuse($bridgeif) { +function bridge_inuse($num) { global $config; $iflist = get_configured_interface_list(false, true); foreach ($iflist as $if) { - if ($config['interfaces'][$if]['if'] == $bridgeif) + if ($config['interfaces'][$if]['if'] == $a_bridges[$num]['bridgeif']) return true; } @@ -60,7 +60,7 @@ function bridge_inuse($bridgeif) { if ($_GET['act'] == "del") { /* check if still in use */ - if (bridge_inuse($a_bridges[$_GET['id']]['bridgeif'])) { + if (bridge_inuse($_GET['id'])) { $input_errors[] = "This bridge TUNNEL cannot be deleted because it is still being used as an interface."; } else { mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy"); -- 1.6.2.2.1669.g7eaf8