From 54de8bbe36d7d968c6367939277942518bd4e11f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 5 Aug 2024 11:56:24 +0200 Subject: Merging upstream version 10.1. Signed-off-by: Daniel Baumann --- mgmtd/mgmt_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'mgmtd/mgmt_main.c') diff --git a/mgmtd/mgmt_main.c b/mgmtd/mgmt_main.c index cce16f5..e181d0d 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 "" -- cgit v1.2.3