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 a4e56c95c8fc7150bf9533e936f61b8da75b9007..46a017f9148db2ab25efbd12ad94fa9e34b7d3c0 100644 (file)
--- 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.";