From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 1 Jun 2016 15:26:29 +0000 (-0400)
Subject: pim: Fix 'no ip pim sm'
X-Git-Tag: frr-2.0-rc1~658
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8371bd6008639842403a761eb301c8db687e382d;p=matthieu%2Ffrr.git

pim: Fix 'no ip pim sm'

The 'no ip pim sm' command was not being accepted.
Additionally fix the help output

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 995f074aa1..d60967c377 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -3273,7 +3273,7 @@ DEFUN (interface_ip_pim_sm,
        "ip pim sm",
        IP_STR
        PIM_STR
-       IFACE_PIM_STR)
+       IFACE_PIM_SM_STR)
 {
   struct interface *ifp;
 
@@ -3344,7 +3344,7 @@ DEFUN (interface_no_ip_pim_sm,
        NO_STR
        IP_STR
        PIM_STR
-       IFACE_PIM_STR)
+       IFACE_PIM_SM_STR)
 {
   struct interface *ifp;
 
@@ -4917,7 +4917,7 @@ void pim_cmd_init()
   install_element (INTERFACE_NODE, &interface_ip_pim_ssm_cmd);
   install_element (INTERFACE_NODE, &interface_no_ip_pim_ssm_cmd);
   install_element (INTERFACE_NODE, &interface_ip_pim_sm_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_pim_ssm_cmd);
+  install_element (INTERFACE_NODE, &interface_no_ip_pim_sm_cmd);
   install_element (INTERFACE_NODE, &interface_ip_pim_drprio_cmd);
   install_element (INTERFACE_NODE, &interface_no_ip_pim_drprio_cmd);
   install_element (INTERFACE_NODE, &interface_ip_pim_hello_cmd);
diff --git a/pimd/pim_cmd.h b/pimd/pim_cmd.h
index a1cb58161f..26191cd0b6 100644
--- a/pimd/pim_cmd.h
+++ b/pimd/pim_cmd.h
@@ -30,6 +30,7 @@
 #define CONF_SSMPINGD_STR                      "Enable ssmpingd operation\n"
 #define SHOW_SSMPINGD_STR                      "ssmpingd operation\n"
 #define IFACE_PIM_STR                          "Enable PIM SSM operation\n"
+#define IFACE_PIM_SM_STR                       "Enable PIM SM operation\n"
 #define IFACE_PIM_HELLO_STR                    "Hello Interval\n"
 #define IFACE_PIM_HELLO_TIME_STR               "Time in seconds for Hello Interval\n"
 #define IFACE_PIM_HELLO_HOLD_STR               "Time in seconds for Hold Interval\n"