From 02dcf3888c643fcbd6b7f01d92eec2f9b5dc5955 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Thu, 24 Jul 2014 08:51:24 -0500 Subject: 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. --- config/openbgpd/openbgpd.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'config/openbgpd') 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"; } -- cgit v1.2.3