]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: unlock node on aggregate error
authorRobert Bays <rbays@vyatta.com>
Thu, 5 Aug 2010 17:26:29 +0000 (10:26 -0700)
committerPaul Jakma <paul@quagga.net>
Mon, 21 Mar 2011 13:15:32 +0000 (13:15 +0000)
* bgp_route.c: (bgp_aggregate_set) make sure to unlock BGP node if failure

bgpd/bgp_route.c

index 85526f5f9cc90581ee830c625e9abeed66923ab9..8b0a3bf9c16d5a88bbc94a5c814702449c07c3a4 100644 (file)
@@ -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;
         }
     }