cleanups and fixes

diff --git a/src/modules/rlm_tacacs/rlm_tacacs.c b/src/modules/rlm_tacacs/rlm_tacacs.c
index 98ce226ef1161d9655b9e0170397af79602ac9fa..48d535af4095eac52c01d9f7b9809e4912c1d058 100644 (file)
--- a/src/modules/rlm_tacacs/rlm_tacacs.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs.c
@@ -219,8 +219,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
                uint32_t code;
 
                code = inst->types[i];
-               fr_assert(code > 0);
-               fr_assert(code < FR_TACACS_PACKET_TYPE_MAX);
+               fr_assert(FR_TACACS_PACKET_CODE_VALID(code));
 
                inst->allowed[code] = true;
        }

diff --git a/src/modules/rlm_tacacs/rlm_tacacs.h b/src/modules/rlm_tacacs/rlm_tacacs.h
index 8f7e503647f7eecfdd92639823d6f8f6845fb83b..d23672f5c7e9f24ed855328ab65ddd321ea56aac 100644 (file)
--- a/src/modules/rlm_tacacs/rlm_tacacs.h
+++ b/src/modules/rlm_tacacs/rlm_tacacs.h
@@ -56,7 +56,7 @@ struct rlm_tacacs_s {
 
        fr_retry_config_t       retry;                  //!< retries shared by all packet types
 
-       bool                    allowed[FR_TACACS_PACKET_TYPE_MAX];
+       bool                    allowed[FR_TACACS_CODE_MAX];
 
        fr_trunk_conf_t         trunk_conf;             //!< trunk configuration
 };

diff --git a/src/modules/rlm_tacacs/rlm_tacacs_tcp.c b/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
index d4ba19cb908ce41a20f3d86bb5f5d37a297bdae6..0b71411e5715884ce796ef5f0db36f82eaf7df41 100644 (file)
--- a/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
@@ -1383,8 +1383,7 @@ static unlang_action_t mod_enqueue(rlm_rcode_t *p_result, void **rctx_out, UNUSE
        udp_request_t                   *u;
        fr_trunk_request_t              *treq;
 
-       fr_assert(request->packet->code > 0);
-       fr_assert(request->packet->code < FR_TACACS_PACKET_TYPE_MAX);
+       fr_assert(FR_TACACS_PACKET_CODE_VALID(request->packet->code));
 
        treq = fr_trunk_request_alloc(t->trunk, request);
        if (!treq) RETURN_MODULE_FAIL;