diff options
author | Chris Buechler <cmb@pfsense.org> | 2014-04-26 17:20:32 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2014-04-26 17:20:32 -0500 |
commit | 549b7ce250b5d2faf4f4d9ea414ff0f23d3685fe (patch) | |
tree | 6f51a081698088edac7a8b1d703eb1b58a3a5a25 /usr/local | |
parent | 67273d727b3beba864d2f741ca978ccebd981db7 (diff) | |
download | pfsense-549b7ce250b5d2faf4f4d9ea414ff0f23d3685fe.zip pfsense-549b7ce250b5d2faf4f4d9ea414ff0f23d3685fe.tar.gz |
Don't refuse to delete a bridge in the GUI just because its bridge interface doesn't exist, just log that it doesn't exist and don't attempt to ifconfig destroy it, delete it from config
Diffstat (limited to 'usr/local')
-rw-r--r-- | usr/local/www/interfaces_bridge.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php index 1a7f556..d41ae44 100644 --- a/usr/local/www/interfaces_bridge.php +++ b/usr/local/www/interfaces_bridge.php @@ -66,10 +66,13 @@ if ($_GET['act'] == "del") { /* check if still in use */ else if (bridge_inuse($_GET['id'])) { $input_errors[] = gettext("This bridge cannot be deleted because it is assigned as an interface."); - } elseif (!does_interface_exist($a_bridges[$_GET['id']]['bridgeif'])) { - $input_errors[] = gettext("Invalid bridge interface."); } else { - mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy"); + if (!does_interface_exist($a_bridges[$_GET['id']]['bridgeif'])) { + log_error("Bridge interface does not exist, skipping ifconfig destroy."); + } else { + mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy"); + } + unset($a_bridges[$_GET['id']]); write_config(); |