From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 24 Jan 2023 01:04:07 +0000 (-0500)
Subject: clean up names
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63d33c6fcb52f697ec987cf0b8e2c73515926317;p=thirdparty%2Ffreeradius-server.git

clean up names

perl -p -i -e 's/fr_tacacs_packet_codes/fr_tacacs_packet_names/g' $(find . -name "*.[ch]" -print)
---

diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c
index a823edd3c25..c0fc5b10e7c 100644
--- a/src/listen/tacacs/proto_tacacs.c
+++ b/src/listen/tacacs/proto_tacacs.c
@@ -295,7 +295,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d
 		fr_pair_t *vp;
 
 		RDEBUG("Received %s ID %i from %pV:%i to %pV:%i length %zu via socket %s",
-		       fr_tacacs_packet_codes[request->packet->code],
+		       fr_tacacs_packet_names[request->packet->code],
 		       request->packet->id,
 		       fr_box_ipaddr(request->packet->socket.inet.src_ipaddr),
 		       request->packet->socket.inet.src_port,
@@ -397,7 +397,7 @@ static ssize_t mod_encode(void const *instance, request_t *request, uint8_t *buf
 
 	if (RDEBUG_ENABLED) {
 		RDEBUG("Sending %s ID %i from %pV:%i to %pV:%i length %zu via socket %s",
-		       fr_tacacs_packet_codes[request->reply->code],
+		       fr_tacacs_packet_names[request->reply->code],
 		       request->reply->id,
 		       fr_box_ipaddr(request->reply->socket.inet.src_ipaddr),
 		       request->reply->socket.inet.src_port,
diff --git a/src/modules/rlm_tacacs/rlm_tacacs.c b/src/modules/rlm_tacacs/rlm_tacacs.c
index a0c1b03f589..d8f219fee9b 100644
--- a/src/modules/rlm_tacacs/rlm_tacacs.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs.c
@@ -169,7 +169,7 @@ static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, modul
 
 	if (!inst->allowed[request->packet->code]) {
 		REDEBUG("Packet code %s is disallowed by the configuration",
-		       fr_tacacs_packet_codes[request->packet->code]);
+		       fr_tacacs_packet_names[request->packet->code]);
 		RETURN_MODULE_FAIL;
 	}
 
diff --git a/src/modules/rlm_tacacs/rlm_tacacs_tcp.c b/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
index 1ea16050956..af36d0efc54 100644
--- a/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
@@ -575,7 +575,7 @@ static ssize_t decode(TALLOC_CTX *ctx, fr_pair_list_t *reply, uint8_t *response_
 	code = data[1];
 
 	RDEBUG("Received %s ID %d length %ld reply packet on connection %s",
-	       fr_tacacs_packet_codes[code], code, packet_len, h->name);
+	       fr_tacacs_packet_names[code], code, packet_len, h->name);
 	log_request_pair_list(L_DBG_LVL_2, request, NULL, reply, NULL);
 
 	*response_code = code;
@@ -879,7 +879,7 @@ static void request_mux(fr_event_list_t *el,
 		h->active++;
 
 		RDEBUG("Sending %s ID %d length %ld over connection %s",
-		       fr_tacacs_packet_codes[u->code], u->id, u->packet_len, h->name);
+		       fr_tacacs_packet_names[u->code], u->id, u->packet_len, h->name);
 
 		if (encode(h, request, u) < 0) {
 			/*
diff --git a/src/protocols/tacacs/base.c b/src/protocols/tacacs/base.c
index 2d38f5de9cf..68470879655 100644
--- a/src/protocols/tacacs/base.c
+++ b/src/protocols/tacacs/base.c
@@ -99,7 +99,7 @@ fr_dict_attr_autoload_t libfreeradius_tacacs_dict_attr[] = {
 	{ NULL }
 };
 
-char const *fr_tacacs_packet_codes[FR_TACACS_CODE_MAX] = {
+char const *fr_tacacs_packet_names[FR_TACACS_CODE_MAX] = {
 	[FR_PACKET_TYPE_VALUE_AUTHENTICATION_START] = "Authentication-Start",
 	[FR_PACKET_TYPE_VALUE_AUTHENTICATION_START_REPLY] = "Authentication-Start-Reply",
 
diff --git a/src/protocols/tacacs/tacacs.h b/src/protocols/tacacs/tacacs.h
index 805f2824fb7..4d7da210c9b 100644
--- a/src/protocols/tacacs/tacacs.h
+++ b/src/protocols/tacacs/tacacs.h
@@ -286,7 +286,7 @@ typedef enum {
 
 #define FR_TACACS_PACKET_CODE_VALID(_code) (((_code) > 0) && ((_code) < FR_TACACS_CODE_MAX))
 
-extern char const *fr_tacacs_packet_codes[FR_TACACS_CODE_MAX];
+extern char const *fr_tacacs_packet_names[FR_TACACS_CODE_MAX];
 
 /** Used as the decoder ctx
  *