From: Donald Sharp <sharpd@nvidia.com>
Date: Wed, 17 Mar 2021 02:21:05 +0000 (-0400)
Subject: bgpd: Attempting to activate unicast and labeled-unicast
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d8479dcdd18cf7d2ee8a7d7675c7406a3583ca2b;p=mirror%2Ffrr.git

bgpd: Attempting to activate unicast and labeled-unicast

Should return an actual useful error message.
Commit: 055679e915fc826fe13abdd8d60a22a0ca35c8c6 messed this error message
up.

Fixes: #8246
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index ee7b851943..40dd368125 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -723,7 +723,7 @@ int bgp_vty_return(struct vty *vty, int ret)
 		str = "Operation not allowed on a directly connected neighbor";
 		break;
 	case BGP_ERR_PEER_SAFI_CONFLICT:
-		str = GR_INVALID;
+		str = "Cannot activate peer for both 'ipv4 unicast' and 'ipv4 labeled-unicast'";
 		break;
 	case BGP_ERR_GR_INVALID_CMD:
 		str = "The Graceful Restart command used is not valid at this moment.";