aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Smith <mgsmith@netgate.com>2015-10-22 14:16:11 -0500
committerMatt Smith <mgsmith@netgate.com>2015-10-22 14:16:11 -0500
commit901d4b81be5f518f4481e487f5568901ef60ac51 (patch)
tree51481ed5a320256bc6cc2641326912b953e353bb
parent1312432b4aa191b0cece4eeae5442fa7cda6f2cf (diff)
downloadpfsense-packages-901d4b81be5f518f4481e487f5568901ef60ac51.tar.gz
pfsense-packages-901d4b81be5f518f4481e487f5568901ef60ac51.tar.bz2
pfsense-packages-901d4b81be5f518f4481e487f5568901ef60ac51.zip
Apply fix previously made for neighbors within a group to neighbors that do not have a group assigned. Fixes #4634.
-rw-r--r--config/openbgpd/openbgpd.inc10
-rw-r--r--pkg_config.10.xml2
2 files changed, 7 insertions, 5 deletions
diff --git a/config/openbgpd/openbgpd.inc b/config/openbgpd/openbgpd.inc
index 93364be9..ddfef18f 100644
--- a/config/openbgpd/openbgpd.inc
+++ b/config/openbgpd/openbgpd.inc
@@ -179,10 +179,12 @@ function openbgpd_install_conf() {
$conffile .= "\t{$row['parameters']} {$row['parmvalue']} \n";
}
}
- if ($setlocaladdr == true && !empty($openbgpd_conf['listenip'])) {
- $conffile .= "\tlocal-address {$openbgpd_conf['listenip']}\n";
- } else {
- $conffile .= "\tlocal-address 0.0.0.0\n";
+ if ($setlocaladdr == true) {
+ if (!empty($openbgpd_conf['listenip'])) {
+ $conffile .= "\tlocal-address {$openbgpd_conf['listenip']}\n";
+ } else {
+ $conffile .= "\tlocal-address 0.0.0.0\n";
+ }
}
$conffile .= "}\n";
}
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index abc8fa95..e45aee77 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -566,7 +566,7 @@
<build_pbi>
<port>net/openbgpd</port>
</build_pbi>
- <version>0.9.3.7</version>
+ <version>0.9.3.8</version>
<status>STABLE</status>
<pkginfolink>https://doc.pfsense.org/index.php/OpenBGPD_package</pkginfolink>
<required_version>2.2</required_version>