From 368473f6120ff295253bcc0d774c6bd75d8cf98b Mon Sep 17 00:00:00 2001
From: Robert Bays <rbays@vyatta.com>
Date: Thu, 5 Aug 2010 10:26:29 -0700
Subject: bgpd: unlock node on aggregate error

* bgp_route.c: (bgp_aggregate_set) make sure to unlock BGP node if failure
---
 bgpd/bgp_route.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bgpd/bgp_route.c')

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;
         }
     }
-- 
cgit v1.2.1