]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
tacacs: Rename 's/TACACS_/FR_TACACS_/g'
authorJorge Pereira <jpereiran@gmail.com>
Thu, 13 Aug 2020 20:09:50 +0000 (17:09 -0300)
committerAlan T. DeKok <aland@freeradius.org>
Sat, 15 Aug 2020 10:54:45 +0000 (06:54 -0400)
src/protocols/tacacs/base.c
src/protocols/tacacs/decode.c
src/protocols/tacacs/encode.c
src/protocols/tacacs/tacacs.h

index 13735500cf6683faf3dc222658f1e0e192bc675e..72a64b3ab3f7874b1a3b98855558daf4fc794939 100644 (file)
@@ -124,7 +124,7 @@ int fr_tacacs_body_xor(fr_tacacs_packet_t *pkt, uint8_t *body, size_t body_len,
        int pad_offset;
 
        if (!secret) {
-               if (pkt->hdr.flags & TAC_PLUS_UNENCRYPTED_FLAG)
+               if (pkt->hdr.flags & FR_TAC_PLUS_UNENCRYPTED_FLAG)
                        return 0;
                else {
                        fr_strerror_printf("Packet is encrypted but no secret for the client is set");
@@ -132,7 +132,7 @@ int fr_tacacs_body_xor(fr_tacacs_packet_t *pkt, uint8_t *body, size_t body_len,
                }
        }
 
-       if (pkt->hdr.flags & TAC_PLUS_UNENCRYPTED_FLAG) {
+       if (pkt->hdr.flags & FR_TAC_PLUS_UNENCRYPTED_FLAG) {
                fr_strerror_printf("Packet is unencrypted but a secret has been set for the client");
                return -1;
        }
index ee5c1902fd453967101c269e773cd0b807521d0f..ddb83ac338c26e0b0326914ea2660f69859d2b72 100644 (file)
@@ -184,7 +184,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
        /*
         *      3.6. Encryption
         */
-       if (pkt->hdr.flags == TAC_PLUS_ENCRYPTED_MULTIPLE_CONNECTIONS_FLAG) {
+       if (pkt->hdr.flags == FR_TAC_PLUS_ENCRYPTED_MULTIPLE_CONNECTIONS_FLAG) {
                uint8_t *body = (our_buffer + sizeof(fr_tacacs_packet_hdr_t));
 
                fr_assert(secret != NULL);
@@ -199,7 +199,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
        }
 
        switch (pkt->hdr.type) {
-       case TAC_PLUS_AUTHEN:
+       case FR_TAC_PLUS_AUTHEN:
                if (packet_is_authen_start_request(pkt)) {
                        /**
                         * 4.1. The Authentication START Packet Body
@@ -221,7 +221,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
                         */
 
                        PACKET_HEADER_CHECKER("Authentication START", 8)
-                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, TACACS_PACKET_BODY_TYPE_START);
+                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, FR_TACACS_PACKET_BODY_TYPE_START);
 
                        /*
                         *      Decode 4 octets of various flags.
@@ -267,7 +267,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
                         */
 
                        PACKET_HEADER_CHECKER("Authentication CONTINUE", 5);
-                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, TACACS_PACKET_BODY_TYPE_CONTINUE);
+                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, FR_TACACS_PACKET_BODY_TYPE_CONTINUE);
 
                        /*
                         *      Decode 2 fields, based on their "length"
@@ -295,7 +295,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
                         */
 
                        PACKET_HEADER_CHECKER("Authentication REPLY", 6);
-                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, TACACS_PACKET_BODY_TYPE_REPLY);
+                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, FR_TACACS_PACKET_BODY_TYPE_REPLY);
 
                        DECODE_GET_FIELD(attr_tacacs_authentication_status, pkt->authen.reply.status);
                        DECODE_GET_FIELD(attr_tacacs_authentication_flags, pkt->authen.reply.flags);
@@ -315,7 +315,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
                }
                break;
 
-       case TAC_PLUS_AUTHOR:
+       case FR_TAC_PLUS_AUTHOR:
                if (packet_is_author_request(pkt)) {
                        /*
                         * 5.1. The Authorization REQUEST Packet Body
@@ -348,7 +348,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
 
                        vp = fr_pair_afrom_da(ctx, attr_tacacs_packet_body_type);
                        if (!vp) goto oom;
-                       vp->vp_uint8 = TACACS_PACKET_BODY_TYPE_REQUEST;
+                       vp->vp_uint8 = FR_TACACS_PACKET_BODY_TYPE_REQUEST;
                        fr_cursor_append(&cursor, vp);
 
                        /*
@@ -402,7 +402,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
                         */
 
                        PACKET_HEADER_CHECKER("Authorization RESPONSE", 6);
-                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, TACACS_PACKET_BODY_TYPE_RESPONSE);
+                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, FR_TACACS_PACKET_BODY_TYPE_RESPONSE);
 
                        /*
                         *      Decode 1 octets
@@ -430,7 +430,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
                }
                break;
 
-       case TAC_PLUS_ACCT:
+       case FR_TAC_PLUS_ACCT:
                if (packet_is_acct_request(pkt)) {
                        /**
                         * 6.1. The Account REQUEST Packet Body
@@ -460,7 +460,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
                         */
 
                        PACKET_HEADER_CHECKER("Accounting REQUEST", 9);
-                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, TACACS_PACKET_BODY_TYPE_REQUEST);
+                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, FR_TACACS_PACKET_BODY_TYPE_REQUEST);
 
                        /*
                         *      Decode 5 octets of various flags.
@@ -504,7 +504,7 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, uint8_t const *buffer, size_t buffer_l
                         */
 
                        PACKET_HEADER_CHECKER("Accounting REPLY", 5);
-                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, TACACS_PACKET_BODY_TYPE_REPLY);
+                       DECODE_GET_FIELD(attr_tacacs_packet_body_type, FR_TACACS_PACKET_BODY_TYPE_REPLY);
 
                        /*
                         *      Decode 2 fields, based on their "length"
index 030b7cd60bee6b5a23e86e3b5cb867e71ca73473..6d508c914ca0305d9a5025b0545277cf152e44a0 100644 (file)
@@ -190,7 +190,7 @@ ssize_t fr_tacacs_encode(uint8_t *buffer, size_t buffer_len, char const * const
         *      Encode 8 octets of various fields not members of STRUCT
         */
        switch (packet->hdr.type) {
-       case TAC_PLUS_AUTHEN:
+       case FR_TAC_PLUS_AUTHEN:
                /*
                 * seq_no
                 *
@@ -354,7 +354,7 @@ ssize_t fr_tacacs_encode(uint8_t *buffer, size_t buffer_len, char const * const
 
                break;
 
-       case TAC_PLUS_AUTHOR:
+       case FR_TAC_PLUS_AUTHOR:
                if (packet_is_author_request(packet)) {
                        /*
                         * 5.1. The Authorization REQUEST Packet Body
@@ -504,7 +504,7 @@ ssize_t fr_tacacs_encode(uint8_t *buffer, size_t buffer_len, char const * const
 
                break;
 
-       case TAC_PLUS_ACCT:
+       case FR_TAC_PLUS_ACCT:
                if (packet_is_acct_request(packet)) {
                        /**
                         * 6.1. The Account REQUEST Packet Body
@@ -639,7 +639,7 @@ ssize_t fr_tacacs_encode(uint8_t *buffer, size_t buffer_len, char const * const
                return -1;
        }
 
-       fr_assert(length_hdr + length_body < TACACS_MAX_PACKET_SIZE);
+       fr_assert(length_hdr + length_body < FR_TACACS_MAX_PACKET_SIZE);
 
        packet->hdr.length = htonl(length_hdr - sizeof(fr_tacacs_packet_hdr_t) + length_body);
        packet_len = (length_hdr + length_body);
@@ -653,7 +653,7 @@ ssize_t fr_tacacs_encode(uint8_t *buffer, size_t buffer_len, char const * const
        /*
         *      3.6. Encryption
         */
-       if (packet->hdr.flags == TAC_PLUS_ENCRYPTED_MULTIPLE_CONNECTIONS_FLAG) {
+       if (packet->hdr.flags == FR_TAC_PLUS_ENCRYPTED_MULTIPLE_CONNECTIONS_FLAG) {
                uint8_t *body = (buffer + sizeof(fr_tacacs_packet_hdr_t));
 
                fr_assert(secret != NULL);
index 90999e47ba4a45adf5a22b08b87b8eea9836c9bc..7a8fa0c15b7c0d5fda54fbd6f0139a9e56ab96be 100644 (file)
  * @copyright 2017 The FreeRADIUS server project
  * @copyright 2017 Network RADIUS SARL (legal@networkradius.com)
  */
-#define TACACS_MAX_PACKET_SIZE         4096
 
-#define TAC_PLUS_MAJOR_VER             12
-#define TAC_PLUS_MINOR_VER_DEFAULT     0
-#define TAC_PLUS_MINOR_VER_ONE         1
+#define FR_TACACS_MAX_PACKET_CODE              (8)
+#define FR_TACACS_MAX_PACKET_SIZE              4096
+
+#define FR_TAC_PLUS_MAJOR_VER                  12
+#define FR_TAC_PLUS_MINOR_VER_DEFAULT          0
+#define FR_TAC_PLUS_MINOR_VER_ONE              1
 
 /**
  * 3.4. The TACACS+ Packet Header
 #define packet_has_valid_seq_no(p)            (p->hdr.seq_no >= 1 && p->hdr.seq_no <= 255)
 
 typedef enum {
-       TAC_PLUS_INVALID                = 0x00,
-       TAC_PLUS_AUTHEN                 = 0x01,
-       TAC_PLUS_AUTHOR                 = 0x02,
-       TAC_PLUS_ACCT                   = 0x03
-} tacacs_type_t;
+       FR_TAC_PLUS_INVALID             = 0x00,
+       FR_TAC_PLUS_AUTHEN                      = 0x01,
+       FR_TAC_PLUS_AUTHOR                      = 0x02,
+       FR_TAC_PLUS_ACCT                        = 0x03
+} fr_tacacs_type_t;
 
 typedef enum {
-       TAC_PLUS_ENCRYPTED_MULTIPLE_CONNECTIONS_FLAG    = 0x00, /* gdb candy */
-       TAC_PLUS_UNENCRYPTED_FLAG                       = 0x01,
-       TAC_PLUS_SINGLE_CONNECT_FLAG                    = 0x04
-} tacacs_flags_t;
+       FR_TAC_PLUS_ENCRYPTED_MULTIPLE_CONNECTIONS_FLAG = 0x00, /* gdb candy */
+       FR_TAC_PLUS_UNENCRYPTED_FLAG                    = 0x01,
+       FR_TAC_PLUS_SINGLE_CONNECT_FLAG                 = 0x04
+} fr_tacacs_flags_t;
 
 typedef struct CC_HINT(__packed__) {
        union {
@@ -75,53 +77,53 @@ typedef struct CC_HINT(__packed__) {
 #endif
                } ver;
        };
-       tacacs_type_t           type:8;
+       fr_tacacs_type_t                type:8;
        uint8_t                 seq_no;
-       tacacs_flags_t          flags:8;
+       fr_tacacs_flags_t               flags:8;
        uint32_t                session_id;
        uint32_t                length;
 } fr_tacacs_packet_hdr_t;
 
 typedef enum {
-       TAC_PLUS_AUTHEN_LOGIN           = 0x01,
-       TAC_PLUS_AUTHEN_CHPASS          = 0x02,
-       TAC_PLUS_AUTHEN_SENDAUTH        = 0x04
-} tacacs_action_t;
+       FR_TAC_PLUS_AUTHEN_LOGIN        = 0x01,
+       FR_TAC_PLUS_AUTHEN_CHPASS       = 0x02,
+       FR_TAC_PLUS_AUTHEN_SENDAUTH     = 0x04
+} fr_tacacs_action_t;
 
 typedef enum {
-       TAC_PLUS_AUTHEN_TYPE_ASCII      = 0x01,
-       TAC_PLUS_AUTHEN_TYPE_PAP        = 0x02,
-       TAC_PLUS_AUTHEN_TYPE_CHAP       = 0x03,
-       TAC_PLUS_AUTHEN_TYPE_ARAP       = 0x04, /* deprecated */
-       TAC_PLUS_AUTHEN_TYPE_MSCHAP     = 0x05,
-       TAC_PLUS_AUTHEN_TYPE_MSCHAPV2   = 0x06
-} tacacs_authentype_t;
+       FR_TAC_PLUS_AUTHEN_TYPE_ASCII           = 0x01,
+       FR_TAC_PLUS_AUTHEN_TYPE_PAP             = 0x02,
+       FR_TAC_PLUS_AUTHEN_TYPE_CHAP            = 0x03,
+       FR_TAC_PLUS_AUTHEN_TYPE_ARAP            = 0x04, /* deprecated */
+       FR_TAC_PLUS_AUTHEN_TYPE_MSCHAP          = 0x05,
+       FR_TAC_PLUS_AUTHEN_TYPE_MSCHAPV2        = 0x06
+} fr_tacacs_authentype_t;
 
 typedef enum {
-       TAC_PLUS_PRIV_LVL_MAX           = 0x0f,
-       TAC_PLUS_PRIV_LVL_ROOT          = 0x0f,
-       TAC_PLUS_PRIV_LVL_USER          = 0x01,
-       TAC_PLUS_PRIV_LVL_MIN           = 0x00
-} tacacs_privlvl_t;
+       FR_TAC_PLUS_PRIV_LVL_MAX                = 0x0f,
+       FR_TAC_PLUS_PRIV_LVL_ROOT               = 0x0f,
+       FR_TAC_PLUS_PRIV_LVL_USER               = 0x01,
+       FR_TAC_PLUS_PRIV_LVL_MIN                = 0x00
+} fr_tacacs_privlvl_t;
 
 typedef enum {
-       TAC_PLUS_AUTHEN_SVC_NONE        = 0x00,
-       TAC_PLUS_AUTHEN_SVC_LOGIN       = 0x01,
-       TAC_PLUS_AUTHEN_SVC_ENABLE      = 0x02,
-       TAC_PLUS_AUTHEN_SVC_PPP         = 0x03,
-       TAC_PLUS_AUTHEN_SVC_ARAP        = 0x04,
-       TAC_PLUS_AUTHEN_SVC_PT          = 0x05,
-       TAC_PLUS_AUTHEN_SVC_RCMD        = 0x06,
-       TAC_PLUS_AUTHEN_SVC_X25         = 0x07,
-       TAC_PLUS_AUTHEN_SVC_NASI        = 0x08,
-       TAC_PLUS_AUTHEN_SVC_FWPROXY     = 0x09
-} tacacs_authenservice_t;
+       FR_TAC_PLUS_AUTHEN_SVC_NONE     = 0x00,
+       FR_TAC_PLUS_AUTHEN_SVC_LOGIN    = 0x01,
+       FR_TAC_PLUS_AUTHEN_SVC_ENABLE   = 0x02,
+       FR_TAC_PLUS_AUTHEN_SVC_PPP      = 0x03,
+       FR_TAC_PLUS_AUTHEN_SVC_ARAP     = 0x04,
+       FR_TAC_PLUS_AUTHEN_SVC_PT       = 0x05,
+       FR_TAC_PLUS_AUTHEN_SVC_RCMD     = 0x06,
+       FR_TAC_PLUS_AUTHEN_SVC_X25      = 0x07,
+       FR_TAC_PLUS_AUTHEN_SVC_NASI     = 0x08,
+       FR_TAC_PLUS_AUTHEN_SVC_FWPROXY  = 0x09
+} fr_tacacs_authenservice_t;
 
 typedef struct CC_HINT(__packed__) {
-       tacacs_action_t         action:8;
-       tacacs_privlvl_t        priv_lvl:8;
-       tacacs_authentype_t     authen_type:8;
-       tacacs_authenservice_t  authen_service:8;
+       fr_tacacs_action_t              action:8;
+       fr_tacacs_privlvl_t     priv_lvl:8;
+       fr_tacacs_authentype_t  authen_type:8;
+       fr_tacacs_authenservice_t       authen_service:8;
        uint8_t                 user_len;
        uint8_t                 port_len;
        uint8_t                 rem_addr_len;
@@ -130,60 +132,60 @@ typedef struct CC_HINT(__packed__) {
 } fr_tacacs_packet_authen_start_hdr_t;
 
 typedef enum {
-       TAC_PLUS_AUTHEN_STATUS_PASS     = 0x01,
-       TAC_PLUS_AUTHEN_STATUS_FAIL     = 0x02,
-       TAC_PLUS_AUTHEN_STATUS_GETDATA  = 0x03,
-       TAC_PLUS_AUTHEN_STATUS_GETUSER  = 0x04,
-       TAC_PLUS_AUTHEN_STATUS_GETPASS  = 0x05,
-       TAC_PLUS_AUTHEN_STATUS_RESTART  = 0x06,
-       TAC_PLUS_AUTHEN_STATUS_ERROR    = 0x07,
-       TAC_PLUS_AUTHEN_STATUS_FOLLOW   = 0x21
-} tacacs_authen_reply_status_t;
+       FR_TAC_PLUS_AUTHEN_STATUS_PASS          = 0x01,
+       FR_TAC_PLUS_AUTHEN_STATUS_FAIL          = 0x02,
+       FR_TAC_PLUS_AUTHEN_STATUS_GETDATA       = 0x03,
+       FR_TAC_PLUS_AUTHEN_STATUS_GETUSER       = 0x04,
+       FR_TAC_PLUS_AUTHEN_STATUS_GETPASS       = 0x05,
+       FR_TAC_PLUS_AUTHEN_STATUS_RESTART       = 0x06,
+       FR_TAC_PLUS_AUTHEN_STATUS_ERROR         = 0x07,
+       FR_TAC_PLUS_AUTHEN_STATUS_FOLLOW        = 0x21
+} fr_tacacs_authen_reply_status_t;
 
 typedef enum {
-       TAC_PLUS_REPLY_FLAG_UNSET       = 0x00, /* gdb candy */
-       TAC_PLUS_REPLY_FLAG_NOECHO      = 0x01
-} tacacs_authen_reply_flags_t;
+       FR_TAC_PLUS_REPLY_FLAG_UNSET    = 0x00, /* gdb candy */
+       FR_TAC_PLUS_REPLY_FLAG_NOECHO   = 0x01
+} fr_tacacs_authen_reply_flags_t;
 
 typedef struct CC_HINT(__packed__) {
-       tacacs_authen_reply_status_t    status:8;
-       tacacs_authen_reply_flags_t     flags:8;
+       fr_tacacs_authen_reply_status_t status:8;
+       fr_tacacs_authen_reply_flags_t  flags:8;
        uint16_t                        server_msg_len;
        uint16_t                        data_len;
        uint8_t                         body[1];
 } fr_tacacs_packet_authen_reply_hdr_t;
 
 typedef enum {
-       TAC_PLUS_CONTINUE_FLAG_UNSET    = 0x00, /* gdb candy */
-       TAC_PLUS_CONTINUE_FLAG_ABORT    = 0x01
-} tacacs_authen_cont_flags_t;
+       FR_TAC_PLUS_CONTINUE_FLAG_UNSET = 0x00, /* gdb candy */
+       FR_TAC_PLUS_CONTINUE_FLAG_ABORT = 0x01
+} fr_tacacs_authen_cont_flags_t;
 
 typedef struct CC_HINT(__packed__) {
        uint16_t                        user_msg_len;
        uint16_t                        data_len;
-       tacacs_authen_cont_flags_t      flags:8;
+       fr_tacacs_authen_cont_flags_t   flags:8;
        uint8_t                         body[1];
 } fr_tacacs_packet_authen_cont_hdr_t;
 
 typedef enum {
-       TAC_PLUS_AUTHEN_METH_NOT_SET    = 0x00,
-       TAC_PLUS_AUTHEN_METH_NONE       = 0x01,
-       TAC_PLUS_AUTHEN_METH_KRB5       = 0x02,
-       TAC_PLUS_AUTHEN_METH_LINE       = 0x03,
-       TAC_PLUS_AUTHEN_METH_ENABLE     = 0x04,
-       TAC_PLUS_AUTHEN_METH_LOCAL      = 0x05,
-       TAC_PLUS_AUTHEN_METH_TACACSPLUS = 0x06,
-       TAC_PLUS_AUTHEN_METH_GUEST      = 0x08,
-       TAC_PLUS_AUTHEN_METH_RADIUS     = 0x10,
-       TAC_PLUS_AUTHEN_METH_KRB4       = 0x11,
-       TAC_PLUS_AUTHEN_METH_RCMD       = 0x20
-} tacacs_author_authen_method_t;
+       FR_TAC_PLUS_AUTHEN_METH_NOT_SET         = 0x00,
+       FR_TAC_PLUS_AUTHEN_METH_NONE            = 0x01,
+       FR_TAC_PLUS_AUTHEN_METH_KRB5            = 0x02,
+       FR_TAC_PLUS_AUTHEN_METH_LINE            = 0x03,
+       FR_TAC_PLUS_AUTHEN_METH_ENABLE          = 0x04,
+       FR_TAC_PLUS_AUTHEN_METH_LOCAL           = 0x05,
+       FR_TAC_PLUS_AUTHEN_METH_TACACSPLUS      = 0x06,
+       FR_TAC_PLUS_AUTHEN_METH_GUEST           = 0x08,
+       FR_TAC_PLUS_AUTHEN_METH_RADIUS          = 0x10,
+       FR_TAC_PLUS_AUTHEN_METH_KRB4            = 0x11,
+       FR_TAC_PLUS_AUTHEN_METH_RCMD            = 0x20
+} fr_tacacs_author_authen_method_t;
 
 typedef struct CC_HINT(__packed__) {
-       tacacs_author_authen_method_t   authen_method:8;
-       tacacs_privlvl_t                priv_lvl:8;
-       tacacs_authentype_t             authen_type:8;
-       tacacs_authenservice_t          authen_service:8;
+       fr_tacacs_author_authen_method_t        authen_method:8;
+       fr_tacacs_privlvl_t             priv_lvl:8;
+       fr_tacacs_authentype_t          authen_type:8;
+       fr_tacacs_authenservice_t               authen_service:8;
        uint8_t                         user_len;
        uint8_t                         port_len;
        uint8_t                         rem_addr_len;
@@ -192,15 +194,15 @@ typedef struct CC_HINT(__packed__) {
 } fr_tacacs_packet_author_req_hdr_t;
 
 typedef enum {
-       TAC_PLUS_AUTHOR_STATUS_PASS_ADD         = 0x01,
-       TAC_PLUS_AUTHOR_STATUS_PASS_REPL        = 0x02,
-       TAC_PLUS_AUTHOR_STATUS_FAIL             = 0x10,
-       TAC_PLUS_AUTHOR_STATUS_ERROR            = 0x11,
-       TAC_PLUS_AUTHOR_STATUS_FOLLOW           = 0x21
-} tacacs_author_res_status_t;
+       FR_TAC_PLUS_AUTHOR_STATUS_PASS_ADD      = 0x01,
+       FR_TAC_PLUS_AUTHOR_STATUS_PASS_REPL     = 0x02,
+       FR_TAC_PLUS_AUTHOR_STATUS_FAIL          = 0x10,
+       FR_TAC_PLUS_AUTHOR_STATUS_ERROR         = 0x11,
+       FR_TAC_PLUS_AUTHOR_STATUS_FOLLOW        = 0x21
+} fr_tacacs_author_res_status_t;
 
 typedef struct CC_HINT(__packed__) {
-       tacacs_author_res_status_t      status:8;
+       fr_tacacs_author_res_status_t   status:8;
        uint8_t                         arg_cnt;
        uint16_t                        server_msg_len;
        uint16_t                        data_len;
@@ -208,17 +210,17 @@ typedef struct CC_HINT(__packed__) {
 } fr_tacacs_packet_author_res_hdr_t;
 
 typedef enum {
-       TAC_PLUS_ACCT_FLAG_START        = 0x02,
-       TAC_PLUS_ACCT_FLAG_STOP         = 0x04,
-       TAC_PLUS_ACCT_FLAG_WATCHDOG     = 0x08
-} tacacs_acct_req_flags_t;
+       FR_TAC_PLUS_ACCT_FLAG_START     = 0x02,
+       FR_TAC_PLUS_ACCT_FLAG_STOP      = 0x04,
+       FR_TAC_PLUS_ACCT_FLAG_WATCHDOG  = 0x08
+} fr_tacacs_acct_req_flags_t;
 
 typedef struct CC_HINT(__packed__) {
-       tacacs_acct_req_flags_t         flags:8;
-       tacacs_author_authen_method_t   authen_method:8;
-       tacacs_privlvl_t                priv_lvl:8;
-       tacacs_authentype_t             authen_type:8;
-       tacacs_authenservice_t          authen_service:8;
+       fr_tacacs_acct_req_flags_t              flags:8;
+       fr_tacacs_author_authen_method_t        authen_method:8;
+       fr_tacacs_privlvl_t             priv_lvl:8;
+       fr_tacacs_authentype_t          authen_type:8;
+       fr_tacacs_authenservice_t               authen_service:8;
        uint8_t                         user_len;
        uint8_t                         port_len;
        uint8_t                         rem_addr_len;
@@ -227,24 +229,24 @@ typedef struct CC_HINT(__packed__) {
 } fr_tacacs_packet_acct_req_hdr_t;
 
 typedef enum {
-       TACACS_PACKET_BODY_TYPE_UNKNOWN  = 0,
-       TACACS_PACKET_BODY_TYPE_START    = 1,
-       TACACS_PACKET_BODY_TYPE_REPLY    = 2,
-       TACACS_PACKET_BODY_TYPE_CONTINUE = 3,
-       TACACS_PACKET_BODY_TYPE_REQUEST  = 4,
-       TACACS_PACKET_BODY_TYPE_RESPONSE = 5
-} tacacs_packet_body_type_t;
+       FR_TACACS_PACKET_BODY_TYPE_UNKNOWN  = 0,
+       FR_TACACS_PACKET_BODY_TYPE_START    = 1,
+       FR_TACACS_PACKET_BODY_TYPE_REPLY    = 2,
+       FR_TACACS_PACKET_BODY_TYPE_CONTINUE = 3,
+       FR_TACACS_PACKET_BODY_TYPE_REQUEST  = 4,
+       FR_TACACS_PACKET_BODY_TYPE_RESPONSE = 5
+} fr_tacacs_packet_body_type_t;
 
 typedef enum {
-       TAC_PLUS_ACCT_STATUS_SUCCESS    = 0x01,
-       TAC_PLUS_ACCT_STATUS_ERROR      = 0x02,
-       TAC_PLUS_ACCT_STATUS_FOLLOW     = 0x21
-} tacacs_acct_reply_status_t;
+       FR_TAC_PLUS_ACCT_STATUS_SUCCESS = 0x01,
+       FR_TAC_PLUS_ACCT_STATUS_ERROR   = 0x02,
+       FR_TAC_PLUS_ACCT_STATUS_FOLLOW  = 0x21
+} fr_tacacs_acct_reply_status_t;
 
 typedef struct CC_HINT(__packed__) {
        uint16_t                        server_msg_len;
        uint16_t                        data_len;
-       tacacs_acct_reply_status_t      status:8;
+       fr_tacacs_acct_reply_status_t   status:8;
        uint8_t                         body[1];
 } fr_tacacs_packet_acct_reply_hdr_t;