diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-10-18 14:12:39 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-10-25 01:54:04 +0200 |
| commit | 3a3a24c869a34ddee9a77e4dd89e019d88323ef2 (patch) | |
| tree | 06d20e21e1592350ae0c4ddd33e2b2350fdf9ef2 | |
| parent | Merge pull request #3222 from srimohans/community (diff) | |
| download | frr-3a3a24c869a34ddee9a77e4dd89e019d88323ef2.tar.xz frr-3a3a24c869a34ddee9a77e4dd89e019d88323ef2.zip | |
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>
| -rwxr-xr-x | vtysh/extract.pl.in | 2 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 4 | ||||
| -rw-r--r-- | vtysh/vtysh.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index 0f68e58d6..596f01738 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 a2154a984..35f719fa5 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 ee980d512..430b117c5 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, |