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 <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-10-29 21:37:30 -04:00
parent 37cdb6e91d
commit 3b13a2ccc1

View File

@ -6341,6 +6341,7 @@ static int pim_ssm_cmd_worker(struct pim_instance *pim, struct vty *vty,
const char *plist) const char *plist)
{ {
int result = pim_ssm_range_set(pim, pim->vrf_id, plist); int result = pim_ssm_range_set(pim, pim->vrf_id, plist);
int ret = CMD_WARNING_CONFIG_FAILED;
if (result == PIM_SSM_ERR_NONE) if (result == PIM_SSM_ERR_NONE)
return CMD_SUCCESS; return CMD_SUCCESS;
@ -6351,12 +6352,13 @@ static int pim_ssm_cmd_worker(struct pim_instance *pim, struct vty *vty,
break; break;
case PIM_SSM_ERR_DUP: case PIM_SSM_ERR_DUP:
vty_out(vty, "%% duplicate config\n"); vty_out(vty, "%% duplicate config\n");
ret = CMD_WARNING;
break; break;
default: default:
vty_out(vty, "%% ssm range config failed\n"); vty_out(vty, "%% ssm range config failed\n");
} }
return CMD_WARNING_CONFIG_FAILED; return ret;
} }
DEFUN (ip_pim_ssm_prefix_list, DEFUN (ip_pim_ssm_prefix_list,