vtysh: Allow eigrp and rip access to keychain.c config

The key-chain code was specific to rip and as such was not
being delivered to eigrp.

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

diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 0f68e58d62ea5cb9640b4d07714fcaec4d083536..596f01738ad19a09bd8fe904d82a3a2dcad4e844 100755 (executable)
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -85,7 +85,7 @@ sub scan_file {
 
         # $protocol is VTYSH_PROTO format for redirection of user input
         if ($file =~ /lib\/keychain\.c$/) {
-            $protocol = "VTYSH_RIPD";
+            $protocol = "VTYSH_RIPD|VTYSH_EIGRPD";
         }
         elsif ($file =~ /lib\/routemap\.c$/) {
             $protocol = "VTYSH_RMAP";

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index a2154a9848ea3c40b2f58a6c0ade4d0273d3d546..35f719fa54eba79710360dbfdc949276beac1687 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1502,7 +1502,7 @@ DEFUNSH(VTYSH_BGPD, vnc_l2_group, vnc_l2_group_cmd, "vnc l2-group NAME",
 }
 #endif
 
-DEFUNSH(VTYSH_RIPD, key_chain, key_chain_cmd, "key chain WORD",
+DEFUNSH(VTYSH_KEYS, key_chain, key_chain_cmd, "key chain WORD",
        "Authentication key management\n"
        "Key-chain management\n"
        "Key-chain name\n")
@@ -1511,7 +1511,7 @@ DEFUNSH(VTYSH_RIPD, key_chain, key_chain_cmd, "key chain WORD",
        return CMD_SUCCESS;
 }
 
-DEFUNSH(VTYSH_RIPD, key, key_cmd, "key (0-2147483647)",
+DEFUNSH(VTYSH_KEYS, key, key_cmd, "key (0-2147483647)",
        "Configure a key\n"
        "Key identifier number\n")
 {

diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h
index ee980d5128d30dfbc1c35ce3aaa3715e73ce66dc..430b117c50a68b45c64ce54135873dd057b4e801 100644 (file)
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@ -55,6 +55,7 @@ DECLARE_MGROUP(MVTYSH)
 #define VTYSH_INTERFACE          VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_PBRD|VTYSH_FABRICD
 #define VTYSH_NS          VTYSH_ZEBRA
 #define VTYSH_VRF        VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_STATICD
+#define VTYSH_KEYS        VTYSH_RIPD|VTYSH_EIGRPD
 
 enum vtysh_write_integrated {
        WRITE_INTEGRATED_UNSPECIFIED,