From 3b13a2ccc1d127aff0d3a1a08388accd9e6cf2fc Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 29 Oct 2019 21:37:30 -0400 Subject: [PATCH] pimd: Duplicate config is not a CMD_WARNING_CONFIG_FAILED When you enter: ip pim ssm prefix-list my-custom-ssm-range ip pim ssm prefix-list my-custom-ssm-range The second instance would cause a failure to happen which should not happen w/ duplicate config. Signed-off-by: Donald Sharp --- pimd/pim_cmd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 6624974c96..e5686a94f4 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -6341,6 +6341,7 @@ static int pim_ssm_cmd_worker(struct pim_instance *pim, struct vty *vty, const char *plist) { int result = pim_ssm_range_set(pim, pim->vrf_id, plist); + int ret = CMD_WARNING_CONFIG_FAILED; if (result == PIM_SSM_ERR_NONE) return CMD_SUCCESS; @@ -6351,12 +6352,13 @@ static int pim_ssm_cmd_worker(struct pim_instance *pim, struct vty *vty, break; case PIM_SSM_ERR_DUP: vty_out(vty, "%% duplicate config\n"); + ret = CMD_WARNING; break; default: vty_out(vty, "%% ssm range config failed\n"); } - return CMD_WARNING_CONFIG_FAILED; + return ret; } DEFUN (ip_pim_ssm_prefix_list,