commit cd557c3d766a7233490b8cf7325219ffa1398ef2
author Donald Sharp <sharpd@cumulusnetworks.com> Wed May 27 17:40:46 2015 -0700
committer Paul Jakma <paul@quagga.net> Wed Jul 29 21:44:02 2015 +0100
tree b69b7c4a2639e5acc6bdc457bbfa4752732afc28
parent 08d95905acd0cbb810831429b638ac2d1604ca37

pim: 'show debugging' collision

The 'show debugging' cli as setup by pim collided with 'show debugging isis'.
Fix that and clean up cli help commands to actually display correctly.

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

pimd/pim_cmd.c

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 13812cd..a5d11b9 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -3519,11 +3519,12 @@
        DEBUG_PIM_STR
        DEBUG_PIM_ZEBRA_STR)
 
-DEFUN (show_debugging,
-       show_debugging_cmd,
-       "show debugging",
+DEFUN (show_debugging_pim,
+       show_debugging_pim_cmd,
+       "show debugging pim",
        SHOW_STR
-       "State of each debugging option\n")
+       DEBUG_STR
+       PIM_STR)
 {
   pim_debug_config_write(vty);
   return CMD_SUCCESS;
@@ -4373,7 +4374,7 @@
   install_element (VIEW_NODE, &show_ip_mroute_count_cmd);
   install_element (VIEW_NODE, &show_ip_rib_cmd);
   install_element (VIEW_NODE, &show_ip_ssmpingd_cmd);
-  install_element (VIEW_NODE, &show_debugging_cmd);
+  install_element (VIEW_NODE, &show_debugging_pim_cmd);
 
   install_element (ENABLE_NODE, &clear_ip_interfaces_cmd);
   install_element (ENABLE_NODE, &clear_ip_igmp_interfaces_cmd);
@@ -4412,7 +4413,7 @@
   install_element (ENABLE_NODE, &show_ip_mroute_count_cmd);
   install_element (ENABLE_NODE, &show_ip_rib_cmd);
   install_element (ENABLE_NODE, &show_ip_ssmpingd_cmd);
-  install_element (ENABLE_NODE, &show_debugging_cmd);
+  install_element (ENABLE_NODE, &show_debugging_pim_cmd);
 
   install_element (ENABLE_NODE, &test_igmp_receive_report_cmd);
   install_element (ENABLE_NODE, &test_pim_receive_assert_cmd);