diff options
author | Chris Buechler <cmb@pfsense.org> | 2014-05-30 19:57:51 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2014-05-30 20:01:46 -0500 |
commit | cac386b68e38ff4e3ff56145f125bc32f677bc73 (patch) | |
tree | 0e7b7f68d2ef4ccddaa2c68b11c94486b691a3f8 | |
parent | 24c57e72a9c39682cb8d0060de39486f22896b29 (diff) | |
download | pfsense-cac386b68e38ff4e3ff56145f125bc32f677bc73.zip pfsense-cac386b68e38ff4e3ff56145f125bc32f677bc73.tar.gz |
remove openbgpd bits from system_gateways_edit and system.inc. The package
match is case-sensitive and hasn't matched the openbgpd package's name in
at least 5 years, so it doesn't do anything. It's far from functional in
any useful manner even fixing that issue.
-rw-r--r-- | etc/inc/system.inc | 4 | ||||
-rw-r--r-- | usr/local/www/system_gateways_edit.php | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 84f78db..1e2657a 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -457,14 +457,14 @@ function system_routing_configure($interface = "") { if ($dont_add_route == false ) { if (!empty($interface) && $interface != $interfacegw) ; - else if (($interfacegw <> "bgpd") && (is_ipaddrv4($gatewayip))) { + else if (is_ipaddrv4($gatewayip)) { log_error("ROUTING: setting default route to $gatewayip"); mwexec("/sbin/route change -inet default " . escapeshellarg($gatewayip)); } if (!empty($interface) && $interface != $interfacegwv6) ; - else if (($interfacegwv6 <> "bgpd") && (is_ipaddrv6($gatewayipv6))) { + else if (is_ipaddrv6($gatewayipv6)) { $ifscope = ""; if (is_linklocal($gatewayipv6)) $ifscope = "%{$defaultifv6}"; diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php index 24936e1..82ab690 100644 --- a/usr/local/www/system_gateways_edit.php +++ b/usr/local/www/system_gateways_edit.php @@ -660,12 +660,6 @@ function enable_change() { echo " selected='selected'"; echo ">" . htmlspecialchars($ifacename) . "</option>"; } - if (is_package_installed("openbgpd") == 1) { - echo "<option value=\"bgpd\""; - if ($pconfig['interface'] == "bgpd") - echo " selected='selected'"; - echo ">" . gettext("Use BGPD") . "</option>"; - } ?> </select><br /> <span class="vexpl"><?=gettext("Choose which interface this gateway applies to."); ?></span> |