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 ee7b851943321e72922c63d3b3bb45a977507b0f..40dd3681255247405ea662c0f33e8e9455c85f7a 100644 (file)
--- 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.";