fix for bug 5841

1 files changed, 30 insertions, 0 deletions

diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 067849e2..835cbb76 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -78,62 +78,77 @@ my %qcom = (
   'protocols bgp var address-family ipv6-unicast redistribute connected' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute connected',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute connected metric' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute connected metric #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected metric #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute connected route-map' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute connected route-map #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected route-map #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute kernel' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute kernel',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute kernel',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute kernel metric' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute kernel metric #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute kernel metric #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute kernel route-map' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute kernel route-map #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute kernel route-map #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute ospfv3' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute ospfv3',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute ospfv3',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute ospfv3 metric' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute ospfv3 metric #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute ospfv3 metric #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute ospfv3 route-map' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute ospfv3 route-map #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute ospfv3 route-map #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute ripng' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute ripng',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute ripng',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute ripng metric' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute ripng metric #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute ripng metric #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute ripng route-map' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute ripng route-map #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute ripng route-map #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute static' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute static',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute static',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute static metric' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute static metric #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute static metric #9',
+      noerr => 'set',
   },
   'protocols bgp var address-family ipv6-unicast redistribute static route-map' => {
       set => 'router bgp #3 ; address-family ipv6 ; redistribute static route-map #9',
       del => 'router bgp #3 ; address-family ipv6 ; no redistribute static route-map #9',
+      noerr => 'set',
   },
   'protocols bgp var aggregate-address' => {
       set => undef,
@@ -1032,62 +1047,77 @@ my %qcom = (
   'protocols bgp var redistribute connected' => {
       set => 'router bgp #3 ; redistribute connected',
       del => 'router bgp #3 ; no redistribute connected',
+      noerr => 'set',
   },
   'protocols bgp var redistribute connected metric' => {
       set => 'router bgp #3 ; redistribute connected metric #7',
       del => 'router bgp #3 ; no redistribute connected metric #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute connected route-map' => {
       set => 'router bgp #3 ; redistribute connected route-map #7',
       del => 'router bgp #3 ; no redistribute connected route-map #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute kernel' => {
       set => 'router bgp #3 ; redistribute kernel',
       del => 'router bgp #3 ; no redistribute kernel',
+      noerr => 'set',
   },
   'protocols bgp var redistribute kernel metric' => {
       set => 'router bgp #3 ; redistribute kernel metric #7',
       del => 'router bgp #3 ; no redistribute kernel metric #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute kernel route-map' => {
       set => 'router bgp #3 ; redistribute kernel route-map #7',
       del => 'router bgp #3 ; no redistribute kernel route-map #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute ospf' => {
       set => 'router bgp #3 ; redistribute ospf',
       del => 'router bgp #3 ; no redistribute ospf',
+      noerr => 'set',
   },
   'protocols bgp var redistribute ospf metric' => {
       set => 'router bgp #3 ; redistribute ospf metric #7',
       del => 'router bgp #3 ; no redistribute ospf metric #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute ospf route-map' => {
       set => 'router bgp #3 ; redistribute ospf route-map #7',
       del => 'router bgp #3 ; no redistribute ospf route-map #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute rip' => {
       set => 'router bgp #3 ; redistribute rip',
       del => 'router bgp #3 ; no redistribute rip',
+      noerr => 'set',
   },
   'protocols bgp var redistribute rip metric' => {
       set => 'router bgp #3 ; redistribute rip metric #7',
       del => 'router bgp #3 ; no redistribute rip metric #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute rip route-map' => {
       set => 'router bgp #3 ; redistribute rip route-map #7',
       del => 'router bgp #3 ; no redistribute rip route-map #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute static' => {
       set => 'router bgp #3 ; redistribute static',
       del => 'router bgp #3 ; no redistribute static',
+      noerr => 'set',
   },
   'protocols bgp var redistribute static metric' => {
       set => 'router bgp #3 ; redistribute static metric #7',
       del => 'router bgp #3 ; no redistribute static metric #7',
+      noerr => 'set',
   },
   'protocols bgp var redistribute static route-map' => {
       set => 'router bgp #3 ; redistribute static route-map #7',
       del => 'router bgp #3 ; no redistribute static route-map #7',
+      noerr => 'set',
   },
   'protocols bgp var timers' => {
       set => 'router bgp #3 ; timers bgp @keepalive @holdtime',