From: Robert Bays <rbays@vyatta.com>
Date: Thu, 5 Aug 2010 17:26:29 +0000 (-0700)
Subject: bgpd: unlock node on aggregate error
X-Git-Tag: frr-2.0-rc1~2107
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=368473f6120ff295253bcc0d774c6bd75d8cf98b;p=mirror%2Ffrr.git

bgpd: unlock node on aggregate error

* bgp_route.c: (bgp_aggregate_set) make sure to unlock BGP node if failure
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 85526f5f9c..8b0a3bf9c1 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;
         }
     }