summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2014-05-30 19:57:51 -0500
committerChris Buechler <cmb@pfsense.org>2014-05-30 19:57:51 -0500
commitbc76b18eb9f5353d5422e661c6b8f5e813a000e4 (patch)
treecd6d7602fd2afe400f4a6e7101eab9b849c518ca
parent7d363e57a0df41604777b4019c98caeef0b8a79f (diff)
downloadpfsense-bc76b18eb9f5353d5422e661c6b8f5e813a000e4.zip
pfsense-bc76b18eb9f5353d5422e661c6b8f5e813a000e4.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.inc4
-rwxr-xr-xusr/local/www/system_gateways_edit.php6
2 files changed, 2 insertions, 8 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 108f86b..825251c 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -444,14 +444,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 d3d20cb..2e605b5 100755
--- a/usr/local/www/system_gateways_edit.php
+++ b/usr/local/www/system_gateways_edit.php
@@ -506,12 +506,6 @@ function monitor_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>
OpenPOWER on IntegriCloud