diff options
Diffstat (limited to 'mgmtd')
| -rw-r--r-- | mgmtd/mgmt_be_adapter.c | 2 | ||||
| -rw-r--r-- | mgmtd/mgmt_main.c | 23 | ||||
| -rw-r--r-- | mgmtd/mgmt_vty.c | 2 | 
3 files changed, 17 insertions, 10 deletions
diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c index b311bf4698..830c410676 100644 --- a/mgmtd/mgmt_be_adapter.c +++ b/mgmtd/mgmt_be_adapter.c @@ -90,10 +90,12 @@ static const char *const ripd_config_xpaths[] = {  	"/frr-ripd:ripd",  	"/frr-route-map:lib",  	"/frr-vrf:lib", +	"/ietf-key-chain:key-chains",  	NULL,  };  static const char *const ripd_oper_xpaths[] = {  	"/frr-ripd:ripd", +	"/ietf-key-chain:key-chains",  	NULL,  };  #endif diff --git a/mgmtd/mgmt_main.c b/mgmtd/mgmt_main.c index cce16f51f6..e181d0da5e 100644 --- a/mgmtd/mgmt_main.c +++ b/mgmtd/mgmt_main.c @@ -10,6 +10,7 @@  #include "lib/version.h"  #include "routemap.h"  #include "filter.h" +#include "keychain.h"  #include "libfrr.h"  #include "frr_pthread.h"  #include "mgmtd/mgmt.h" @@ -185,6 +186,8 @@ static const struct frr_yang_module_info *const mgmt_yang_modules[] = {  	&frr_zebra_cli_info,  	&zebra_route_map_info, +	&ietf_key_chain_cli_info, +	&ietf_key_chain_deviation_info,  #ifdef HAVE_RIPD  	&frr_ripd_cli_info, @@ -199,20 +202,20 @@ static const struct frr_yang_module_info *const mgmt_yang_modules[] = {  /* clang-format off */  FRR_DAEMON_INFO(mgmtd, MGMTD, -	.vty_port = MGMTD_VTY_PORT, -	.proghelp = "FRR Management Daemon.", +		.vty_port = MGMTD_VTY_PORT, +		.proghelp = "FRR Management Daemon.", -	.signals = mgmt_signals, -	.n_signals = array_size(mgmt_signals), +		.signals = mgmt_signals, +		.n_signals = array_size(mgmt_signals), -	.privs = &mgmt_privs, +		.privs = &mgmt_privs, -	.yang_modules = mgmt_yang_modules, -	.n_yang_modules = array_size(mgmt_yang_modules), +		.yang_modules = mgmt_yang_modules, +		.n_yang_modules = array_size(mgmt_yang_modules), -	/* avoid libfrr trying to read our config file for us */ -	.flags = FRR_MANUAL_VTY_START | FRR_NO_SPLIT_CONFIG, -); +		/* avoid libfrr trying to read our config file for us */ +		.flags = FRR_MANUAL_VTY_START | FRR_NO_SPLIT_CONFIG, +	);  /* clang-format on */  #define DEPRECATED_OPTIONS "" diff --git a/mgmtd/mgmt_vty.c b/mgmtd/mgmt_vty.c index bbc1077870..2cd24719bc 100644 --- a/mgmtd/mgmt_vty.c +++ b/mgmtd/mgmt_vty.c @@ -12,6 +12,7 @@  #include "command.h"  #include "filter.h"  #include "json.h" +#include "keychain.h"  #include "network.h"  #include "northbound_cli.h"  #include "routemap.h" @@ -600,6 +601,7 @@ void mgmt_vty_init(void)  	filter_cli_init();  	route_map_cli_init();  	affinity_map_init(); +	keychain_cli_init();  	/*  	 * Initialize command handling from VTYSH connection.  | 
