aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Smith <mgsmith@netgate.com>2014-07-24 08:51:24 -0500
committerMatt Smith <mgsmith@netgate.com>2014-07-24 08:51:24 -0500
commit02dcf3888c643fcbd6b7f01d92eec2f9b5dc5955 (patch)
treee57061271277bfce70d8125d3800036c697f718c
parent413a8566ef8508972e1f663f269619f26a9c543a (diff)
downloadpfsense-packages-02dcf3888c643fcbd6b7f01d92eec2f9b5dc5955.tar.gz
pfsense-packages-02dcf3888c643fcbd6b7f01d92eec2f9b5dc5955.tar.bz2
pfsense-packages-02dcf3888c643fcbd6b7f01d92eec2f9b5dc5955.zip
Fix #3772 - 'Broken openbgpd config generation logic in 2.2'.
Change logic guiding generation of local-address statements in neighbor configs so that only one local-address is generated when a 'Local address X' parameter is defined for a neighbor.
-rw-r--r--config/openbgpd/openbgpd.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/config/openbgpd/openbgpd.inc b/config/openbgpd/openbgpd.inc
index 76aeb54f..897d83d1 100644
--- a/config/openbgpd/openbgpd.inc
+++ b/config/openbgpd/openbgpd.inc
@@ -129,10 +129,11 @@ function openbgpd_install_conf() {
$conffile .= "\t\t{$row['parameters']} {$row['parmvalue']} \n";
}
}
- if ($setlocaladdr == true && !empty($openbgpd_conf['listenip']))
- $conffile .= "\t\tlocal-address {$openbgpd_conf['listenip']}\n";
- else
- $conffile .= "\t\tlocal-address 0.0.0.0\n";
+ if ($setlocaladdr == true)
+ if (!empty($openbgpd_conf['listenip']))
+ $conffile .= "\t\tlocal-address {$openbgpd_conf['listenip']}\n";
+ else
+ $conffile .= "\t\tlocal-address 0.0.0.0\n";
$conffile .= "}\n";
}