summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bays <robert@vyatta.com>2010-08-12 10:47:48 -0700
committerRobert Bays <robert@vyatta.com>2010-08-12 10:47:48 -0700
commit8e5c84d12fd839a97e92bf0fe476780613149af8 (patch)
tree4ce2f66ceabd6fcd3dac8cd1d9a4ec9c06cff716
parent2630c9e4380121e166f0a3d8ffb4d7609c0eb982 (diff)
downloadvyatta-cfg-quagga-8e5c84d12fd839a97e92bf0fe476780613149af8.tar.gz
vyatta-cfg-quagga-8e5c84d12fd839a97e92bf0fe476780613149af8.zip
fix for bug 6041
-rwxr-xr-xscripts/bgp/vyatta-bgp.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 3bfb4cc0..bc7e684b 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -1239,7 +1239,8 @@ sub bgp_type_change {
# check if changing from iBGP to eBGP
if ( (iBGP_peer(1, $neighbor, $as, $ntype)) && (! iBGP_peer(0, $neighbor, $as, $ntype)) ) {
- if ($config->exists("$as $ntype $neighbor route-reflector-client")) {
+ if ( $config->exists("$as $ntype $neighbor route-reflector-client") ||
+ $config->exists("$as $ntype $neighbor address-family ipv6-unicast route-reflector-client") ) {
return "can not set route-reflector-client and an eBGP remote-as at the same time\n";
}
}