From: Alan T. DeKok Date: Tue, 17 Jan 2023 19:01:25 +0000 (-0500) Subject: it helps to parse the io_submodule X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b037207d2031afc5afc6a95f1064615fbf207a0f;p=thirdparty%2Ffreeradius-server.git it helps to parse the io_submodule --- diff --git a/src/modules/rlm_tacacs/rlm_tacacs.c b/src/modules/rlm_tacacs/rlm_tacacs.c index a5124771989..b19489d04a0 100644 --- a/src/modules/rlm_tacacs/rlm_tacacs.c +++ b/src/modules/rlm_tacacs/rlm_tacacs.c @@ -47,6 +47,9 @@ static CONF_PARSER retry_config[] = { * A mapping of configuration file names to internal variables. */ static CONF_PARSER const module_config[] = { + { FR_CONF_OFFSET("transport", FR_TYPE_VOID, rlm_tacacs_t, io_submodule), + .func = module_rlm_submodule_parse }, + { FR_CONF_OFFSET("type", FR_TYPE_UINT32 | FR_TYPE_MULTI | FR_TYPE_NOT_EMPTY | FR_TYPE_REQUIRED, rlm_tacacs_t, types), .func = type_parse }, @@ -222,7 +225,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx) code = inst->types[i]; fr_assert(code > 0); - fr_assert(code < FR_TAC_PLUS_MAX); + fr_assert(code < FR_TACACS_PACKET_TYPE_MAX); inst->allowed[code] = true; } diff --git a/src/modules/rlm_tacacs/rlm_tacacs.h b/src/modules/rlm_tacacs/rlm_tacacs.h index 0bf7005d211..8f7e503647f 100644 --- a/src/modules/rlm_tacacs/rlm_tacacs.h +++ b/src/modules/rlm_tacacs/rlm_tacacs.h @@ -36,6 +36,8 @@ typedef struct rlm_tacacs_s rlm_tacacs_t; typedef struct rlm_tacacs_io_s rlm_tacacs_io_t; +#define FR_TACACS_PACKET_TYPE_MAX (10) + /* * Define a structure for our module configuration. */ @@ -54,7 +56,7 @@ struct rlm_tacacs_s { fr_retry_config_t retry; //!< retries shared by all packet types - bool allowed[FR_TAC_PLUS_MAX]; + bool allowed[FR_TACACS_PACKET_TYPE_MAX]; fr_trunk_conf_t trunk_conf; //!< trunk configuration };