From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 18 Oct 2018 12:12:39 +0000 (-0400)
Subject: vtysh: Allow eigrp and rip access to keychain.c config
X-Git-Tag: frr-7.1-dev~237^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3a3a24c869a34ddee9a77e4dd89e019d88323ef2;p=matthieu%2Ffrr.git

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 0f68e58d62..596f01738a 100755
--- 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 a2154a9848..35f719fa54 100644
--- 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 ee980d5128..430b117c50 100644
--- 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,