summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bays <rbays@vyatta.com>2010-08-05 10:26:29 -0700
committerPaul Jakma <paul@quagga.net>2011-03-21 13:15:32 +0000
commit368473f6120ff295253bcc0d774c6bd75d8cf98b (patch)
tree2c8663378a82c107a6feb2955a10e61e06f5b869
parentf6269b4f7a2faddc44d03ff0a0e4d141562c67ee (diff)
bgpd: unlock node on aggregate error
* bgp_route.c: (bgp_aggregate_set) make sure to unlock BGP node if failure
-rw-r--r--bgpd/bgp_route.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 85526f5f..8b0a3bf9 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -5059,11 +5059,12 @@ bgp_aggregate_set (struct vty *vty, const char *prefix_str,
if (rn->info)
{
vty_out (vty, "There is already same aggregate network.%s", VTY_NEWLINE);
- /* remove old entry */
+ /* try to remove the old entry */
ret = bgp_aggregate_unset (vty, prefix_str, afi, safi);
if (ret)
{
- vty_out (vty, "Error deleteing aggregate%s", VTY_NEWLINE);
+ vty_out (vty, "Error deleting aggregate.%s", VTY_NEWLINE);
+ bgp_unlock_node (rn);
return CMD_WARNING;
}
}