From a59803d0603d277269c4c5c1511cad68684752ae Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 16 Mar 2021 22:21:05 -0400 Subject: [PATCH] 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 --- bgpd/bgp_vty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index a4e56c95c8..46a017f914 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -739,7 +739,7 @@ int bgp_nb_errmsg_return(char *errmsg, size_t errmsg_len, 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."; @@ -831,7 +831,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."; -- 2.39.5