diff options
| author | Ermal <eri@pfsense.org> | 2013-01-26 22:19:17 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-01-26 22:19:33 +0000 |
| commit | 6d53bbb5062fc5ce5bc05801718aa10edd95ab37 (patch) | |
| tree | 1b9d3b43b0f489f124d3d01756295599d2a3fec5 /etc | |
| parent | 690c491399ed5c25ea45c7a3a954c5d2691bab6c (diff) | |
| download | pfsense-6d53bbb5062fc5ce5bc05801718aa10edd95ab37.zip pfsense-6d53bbb5062fc5ce5bc05801718aa10edd95ab37.tar.gz | |
Correct another parameter passed to pfsense functions
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 6b2cb42..dab71cd 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -507,8 +507,10 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) { pfSense_interface_destroy($bridge['bridgeif']); pfSense_interface_create($bridge['bridgeif']); $bridgeif = escapeshellarg($bridge['bridgeif']); - } else + } else { $bridgeif = pfSense_interface_create("bridge"); + $bridge['bridgeif'] = $bridgeif; + } $checklist = get_configured_interface_list(); @@ -525,7 +527,7 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) { pfSense_interface_mtu($realif, $smallermtu); pfSense_interface_capabilities($realif, -$flags); interfaces_bring_up($realif); - pfSense_bridge_add_member($bridgeif, $realif); + pfSense_bridge_add_member($bridge['bridgeif'], $realif); } if (isset($bridge['enablestp'])) { @@ -628,12 +630,12 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) { } } - if($bridgeif) - interfaces_bring_up($bridgeif); + if ($bridgeif) + interfaces_bring_up($bridge['bridgeif']); else log_error(gettext("bridgeif not defined -- could not bring interface up")); - return $bridgeif; + return $bridge['bridgeif']; } function interface_bridge_add_member($bridgeif, $interface) { |
