]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd: Duplicate config is not a CMD_WARNING_CONFIG_FAILED
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 30 Oct 2019 01:37:30 +0000 (21:37 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 30 Oct 2019 01:37:30 +0000 (21:37 -0400)
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>
pimd/pim_cmd.c

index 6624974c96cc9e14bf759d8a10e23f36ab06a96c..e5686a94f44bc34c3a51162343cb2c718c2c0543 100644 (file)
@@ -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,