From 9267029d4ff78bf397a3e15d6ef9e30d31aa5a5d Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Thu, 16 May 2024 16:48:01 -0600 Subject: [PATCH] s/name/name1/g --- src/lib/server/virtual_servers.c | 20 +++++++------- src/lib/server/virtual_servers.h | 3 +-- src/process/arp/base.c | 12 ++++----- src/process/dhcpv4/base.c | 26 +++++++++--------- src/process/dhcpv6/base.c | 28 +++++++++---------- src/process/dns/base.c | 22 +++++++-------- src/process/eap_aka/base.c | 46 ++++++++++++++++---------------- src/process/eap_aka_prime/base.c | 46 ++++++++++++++++---------------- src/process/eap_sim/base.c | 42 ++++++++++++++--------------- src/process/ldap_sync/base.c | 12 ++++----- src/process/radius/base.c | 34 +++++++++++------------ src/process/tacacs/base.c | 42 ++++++++++++++--------------- src/process/test/base.c | 4 +-- src/process/tls/base.c | 8 +++--- src/process/ttls/base.c | 14 +++++----- src/process/vmps/base.c | 10 +++---- 16 files changed, 184 insertions(+), 185 deletions(-) diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c index 729100b64a..595f2a92cf 100644 --- a/src/lib/server/virtual_servers.c +++ b/src/lib/server/virtual_servers.c @@ -875,7 +875,7 @@ int virtual_server_compile_sections(CONF_SECTION *server, virtual_server_compile * looks. It's not O(n^2), but O(n logn). But it could * still be improved. */ - for (i = 0; list[i].name != NULL; i++) { + for (i = 0; list[i].name1 != NULL; i++) { int rcode; CONF_SECTION *bad; @@ -887,10 +887,10 @@ int virtual_server_compile_sections(CONF_SECTION *server, virtual_server_compile if (list[i].name2 != CF_IDENT_ANY) { void *instruction = NULL; - subcs = cf_section_find(server, list[i].name, list[i].name2); + subcs = cf_section_find(server, list[i].name1, list[i].name2); if (!subcs) { DEBUG3("Warning: Skipping %s %s { ... } as it was not found.", - list[i].name, list[i].name2); + list[i].name1, list[i].name2); /* * Initialise CONF_SECTION pointer for missing section */ @@ -903,7 +903,7 @@ int virtual_server_compile_sections(CONF_SECTION *server, virtual_server_compile /* * Duplicate sections are forbidden. */ - bad = cf_section_find_next(server, subcs, list[i].name, list[i].name2); + bad = cf_section_find_next(server, subcs, list[i].name1, list[i].name2); if (bad) { forbidden: cf_log_err(bad, "Duplicate sections are forbidden."); @@ -941,19 +941,19 @@ int virtual_server_compile_sections(CONF_SECTION *server, virtual_server_compile * Find all subsections with the given first name * and compile them. */ - while ((subcs = cf_section_find_next(server, subcs, list[i].name, CF_IDENT_ANY))) { + while ((subcs = cf_section_find_next(server, subcs, list[i].name1, CF_IDENT_ANY))) { char const *name2; name2 = cf_section_name2(subcs); if (!name2) { - cf_log_err(subcs, "Invalid '%s { ... }' section, it must have a name", list[i].name); + cf_log_err(subcs, "Invalid '%s { ... }' section, it must have a name", list[i].name1); return -1; } /* * Duplicate sections are forbidden. */ - bad = cf_section_find_next(server, subcs, list[i].name, name2); + bad = cf_section_find_next(server, subcs, list[i].name1, name2); if (bad) goto forbidden; rcode = unlang_compile(subcs, list[i].component, rules, NULL); @@ -979,7 +979,7 @@ static int8_t server_section_name_cmp(void const *one, void const *two) virtual_server_compile_t const *b = two; int ret; - ret = strcmp(a->name, b->name); + ret = strcmp(a->name1, b->name1); ret = CMP(ret, 0); if (ret != 0) return ret; @@ -1056,7 +1056,7 @@ virtual_server_method_t const *virtual_server_section_methods(char const *name1, if (name2 != CF_IDENT_ANY) { entry = fr_rb_find(server_section_name_tree, &(virtual_server_compile_t) { - .name = name1, + .name1 = name1, .name2 = name2, }); if (entry) return entry->methods; @@ -1067,7 +1067,7 @@ virtual_server_method_t const *virtual_server_section_methods(char const *name1, */ entry = fr_rb_find(server_section_name_tree, &(virtual_server_compile_t) { - .name = name1, + .name1 = name1, .name2 = CF_IDENT_ANY, }); if (!entry) return NULL; diff --git a/src/lib/server/virtual_servers.h b/src/lib/server/virtual_servers.h index c40b8ea9b5..911dd2cb61 100644 --- a/src/lib/server/virtual_servers.h +++ b/src/lib/server/virtual_servers.h @@ -102,9 +102,8 @@ typedef struct { * */ typedef struct { - char const *name; //!< Name of the processing section, such as "recv" or "send" + char const *name1; //!< Name of the processing section, such as "recv" or "send" char const *name2; //!< Second name, such as "Access-Request" - rlm_components_t component; //!< Sets the default list of actions for this section size_t offset; //!< where the CONF_SECTION pointer is written bool dont_cache; //!< If true, the CONF_SECTION pointer won't be written ///< and the offset will be ignored. diff --git a/src/process/arp/base.c b/src/process/arp/base.c index f826f20cc3..32df7d7255 100644 --- a/src/process/arp/base.c +++ b/src/process/arp/base.c @@ -204,38 +204,38 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc static const virtual_server_compile_t compile_list[] = { { - .name = "recv", + .name1 = "recv", .name2 = "Request", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(request), }, { - .name = "send", + .name1 = "send", .name2 = "Reply", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(reply), }, { /* we can listen for others ARP replies, too */ - .name = "recv", + .name1 = "recv", .name2 = "Reply", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_reply), }, { - .name = "recv", + .name1 = "recv", .name2 = "Reverse-Request", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(reverse_request), }, { - .name = "send", + .name1 = "send", .name2 = "Reverse-Reply", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(reverse_reply), }, { - .name = "send", + .name1 = "send", .name2 = "Do-Not-Respond", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(do_not_respond), diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c index f6838260b1..eecf42e042 100644 --- a/src/process/dhcpv4/base.c +++ b/src/process/dhcpv4/base.c @@ -419,7 +419,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc static const virtual_server_compile_t compile_list[] = { { - .name = "recv", + .name1 = "recv", .name2 = "Discover", .component = MOD_POST_AUTH, @@ -433,13 +433,13 @@ static const virtual_server_compile_t compile_list[] = { .offset = PROCESS_CONF_OFFSET(discover), }, { - .name = "send", + .name1 = "send", .name2 = "Offer", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(offer), }, { - .name = "recv", + .name1 = "recv", .name2 = "Request", .component = MOD_POST_AUTH, @@ -454,19 +454,19 @@ static const virtual_server_compile_t compile_list[] = { }, { - .name = "send", + .name1 = "send", .name2 = "Ack", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(ack), }, { - .name = "send", + .name1 = "send", .name2 = "NAK", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(nak), }, { - .name = "recv", + .name1 = "recv", .name2 = "Decline", .component = MOD_POST_AUTH, @@ -481,7 +481,7 @@ static const virtual_server_compile_t compile_list[] = { }, { - .name = "recv", + .name1 = "recv", .name2 = "Release", .component = MOD_POST_AUTH, @@ -495,39 +495,39 @@ static const virtual_server_compile_t compile_list[] = { .offset = PROCESS_CONF_OFFSET(release), }, { - .name = "recv", + .name1 = "recv", .name2 = "Inform", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(inform), }, { - .name = "recv", + .name1 = "recv", .name2 = "Lease-Query", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(lease_query), }, { - .name = "send", + .name1 = "send", .name2 = "Lease-Unassigned", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(lease_unassigned), }, { - .name = "send", + .name1 = "send", .name2 = "Lease-Unknown", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(lease_unknown), }, { - .name = "send", + .name1 = "send", .name2 = "Lease-Active", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(lease_active), }, { - .name = "send", + .name1 = "send", .name2 = "Do-Not-Respond", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(do_not_respond), diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c index dbac1aea90..1479513c79 100644 --- a/src/process/dhcpv6/base.c +++ b/src/process/dhcpv6/base.c @@ -194,86 +194,86 @@ static conf_parser_t dhcpv6_process_config[] = { static const virtual_server_compile_t compile_list[] = { { - .name = "recv", + .name1 = "recv", .name2 = "Solicit", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_solicit) }, { - .name = "recv", + .name1 = "recv", .name2 = "Request", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Confirm", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_confirm) }, { - .name = "recv", + .name1 = "recv", .name2 = "Renew", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_renew) }, { - .name = "recv", + .name1 = "recv", .name2 = "Rebind", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_rebind) }, { - .name = "recv", + .name1 = "recv", .name2 = "Release", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_release) }, { - .name = "recv", + .name1 = "recv", .name2 = "Decline", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_decline) }, { - .name = "recv", + .name1 = "recv", .name2 = "Reconfigure", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_reconfigure) }, { - .name = "recv", + .name1 = "recv", .name2 = "Information-Request", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_information_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Relay-Forward", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_relay_forward) }, { - .name = "send", + .name1 = "send", .name2 = "Advertise", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(send_advertise) }, { - .name = "send", + .name1 = "send", .name2 = "Reply", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(send_reply) }, { - .name = "send", + .name1 = "send", .name2 = "Relay-Reply", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(send_relay_reply) }, { - .name = "send", + .name1 = "send", .name2 = "Do-Not-Respond", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(do_not_respond) diff --git a/src/process/dns/base.c b/src/process/dns/base.c index 387b3aff6c..3857f46c2b 100644 --- a/src/process/dns/base.c +++ b/src/process/dns/base.c @@ -131,67 +131,67 @@ typedef struct { static const virtual_server_compile_t compile_list[] = { { - .name = "recv", + .name1 = "recv", .name2 = "Query", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(query), }, { - .name = "send", + .name1 = "send", .name2 = "Query-Response", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(query_response), }, { - .name = "recv", + .name1 = "recv", .name2 = "Inverse-Query", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(inverse_query), }, { - .name = "send", + .name1 = "send", .name2 = "Inverse-Query-Response", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(inverse_query_response), }, { - .name = "recv", + .name1 = "recv", .name2 = "Status", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(status), }, { - .name = "send", + .name1 = "send", .name2 = "Status-Response", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(status_response), }, { - .name = "recv", + .name1 = "recv", .name2 = "Update", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(update), }, { - .name = "send", + .name1 = "send", .name2 = "Update-Response", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(update_response), }, { - .name = "recv", + .name1 = "recv", .name2 = "Stateful-Operation", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(stateful_operation), }, { - .name = "send", + .name1 = "send", .name2 = "Stateful-Operation-Response", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(stateful_operation_response), }, { - .name = "send", + .name1 = "send", .name2 = "Do-Not-Respond", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(do_not_respond), diff --git a/src/process/eap_aka/base.c b/src/process/eap_aka/base.c index 89f54d5de7..28df461ed0 100644 --- a/src/process/eap_aka/base.c +++ b/src/process/eap_aka/base.c @@ -54,13 +54,13 @@ static virtual_server_compile_t const compile_list[] = { * identities. */ { - .name = "recv", + .name1 = "recv", .name2 = "Identity-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_identity_response) }, { - .name = "send", + .name1 = "send", .name2 = "Identity-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_identity_request) @@ -72,13 +72,13 @@ static virtual_server_compile_t const compile_list[] = { * request/response rounds. */ { - .name = "send", + .name1 = "send", .name2 = "AKA-Identity-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_aka_identity_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "AKA-Identity-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_aka_identity_response) @@ -88,13 +88,13 @@ static virtual_server_compile_t const compile_list[] = { * Full-Authentication */ { - .name = "send", + .name1 = "send", .name2 = "Challenge-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_aka_challenge_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Challenge-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_aka_challenge_response) @@ -104,13 +104,13 @@ static virtual_server_compile_t const compile_list[] = { * Fast-Re-Authentication */ { - .name = "send", + .name1 = "send", .name2 = "Reauthentication-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_reauthentication_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Reauthentication-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_reauthentication_response) @@ -120,19 +120,19 @@ static virtual_server_compile_t const compile_list[] = { * Failures originating from the supplicant */ { - .name = "recv", + .name1 = "recv", .name2 = "Client-Error", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_client_error) }, { - .name = "recv", + .name1 = "recv", .name2 = "Authentication-Reject", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_aka_authentication_reject) }, { - .name = "recv", + .name1 = "recv", .name2 = "Synchronization-Failure", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_aka_synchronization_failure) @@ -142,13 +142,13 @@ static virtual_server_compile_t const compile_list[] = { * Failure originating from the server */ { - .name = "send", + .name1 = "send", .name2 = "Failure-Notification", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_failure_notification) }, { - .name = "recv", + .name1 = "recv", .name2 = "Failure-Notification-ACK", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_failure_notification_ack) @@ -158,13 +158,13 @@ static virtual_server_compile_t const compile_list[] = { * Protected success indication */ { - .name = "send", + .name1 = "send", .name2 = "Success-Notification", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_success_notification) }, { - .name = "recv", + .name1 = "recv", .name2 = "Success-Notification-ACK", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_success_notification_ack) @@ -174,13 +174,13 @@ static virtual_server_compile_t const compile_list[] = { * Final EAP-Success and EAP-Failure messages */ { - .name = "send", + .name1 = "send", .name2 = "EAP-Success", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_eap_success) }, { - .name = "send", + .name1 = "send", .name2 = "EAP-Failure", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_eap_failure) @@ -190,19 +190,19 @@ static virtual_server_compile_t const compile_list[] = { * Fast-Reauth vectors */ { - .name = "store", + .name1 = "store", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.store_session) }, { - .name = "load", + .name1 = "load", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.load_session) }, { - .name = "clear", + .name1 = "clear", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.clear_session) @@ -212,19 +212,19 @@ static virtual_server_compile_t const compile_list[] = { * Pseudonym processing */ { - .name = "store", + .name1 = "store", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.store_pseudonym) }, { - .name = "load", + .name1 = "load", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.load_pseudonym) }, { - .name = "clear", + .name1 = "clear", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.clear_pseudonym) diff --git a/src/process/eap_aka_prime/base.c b/src/process/eap_aka_prime/base.c index 3edba89620..1da26715ea 100644 --- a/src/process/eap_aka_prime/base.c +++ b/src/process/eap_aka_prime/base.c @@ -55,13 +55,13 @@ static virtual_server_compile_t const compile_list[] = { * identities. */ { - .name = "recv", + .name1 = "recv", .name2 = "Identity-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_identity_response) }, { - .name = "send", + .name1 = "send", .name2 = "Identity-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_identity_request) @@ -73,13 +73,13 @@ static virtual_server_compile_t const compile_list[] = { * request/response rounds. */ { - .name = "send", + .name1 = "send", .name2 = "AKA-Identity-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_aka_identity_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "AKA-Identity-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_aka_identity_response) @@ -89,13 +89,13 @@ static virtual_server_compile_t const compile_list[] = { * Full-Authentication */ { - .name = "send", + .name1 = "send", .name2 = "Challenge-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_aka_challenge_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Challenge-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_aka_challenge_response) @@ -105,13 +105,13 @@ static virtual_server_compile_t const compile_list[] = { * Fast-Re-Authentication */ { - .name = "send", + .name1 = "send", .name2 = "Reauthentication-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_reauthentication_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Reauthentication-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_reauthentication_response) @@ -121,19 +121,19 @@ static virtual_server_compile_t const compile_list[] = { * Failures originating from the supplicant */ { - .name = "recv", + .name1 = "recv", .name2 = "Client-Error", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_client_error) }, { - .name = "recv", + .name1 = "recv", .name2 = "Authentication-Reject", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_aka_authentication_reject) }, { - .name = "recv", + .name1 = "recv", .name2 = "Synchronization-Failure", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_aka_synchronization_failure) @@ -143,13 +143,13 @@ static virtual_server_compile_t const compile_list[] = { * Failure originating from the server */ { - .name = "send", + .name1 = "send", .name2 = "Failure-Notification", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_failure_notification) }, { - .name = "recv", + .name1 = "recv", .name2 = "Failure-Notification-ACK", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_failure_notification_ack) @@ -159,13 +159,13 @@ static virtual_server_compile_t const compile_list[] = { * Protected success indication */ { - .name = "send", + .name1 = "send", .name2 = "Success-Notification", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_success_notification) }, { - .name = "recv", + .name1 = "recv", .name2 = "Success-Notification-ACK", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_success_notification_ack) @@ -175,13 +175,13 @@ static virtual_server_compile_t const compile_list[] = { * Final EAP-Success and EAP-Failure messages */ { - .name = "send", + .name1 = "send", .name2 = "EAP-Success", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_eap_success) }, { - .name = "send", + .name1 = "send", .name2 = "EAP-Failure", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_eap_failure) @@ -191,19 +191,19 @@ static virtual_server_compile_t const compile_list[] = { * Fast-Reauth vectors */ { - .name = "store", + .name1 = "store", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.store_session) }, { - .name = "load", + .name1 = "load", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.load_session) }, { - .name = "clear", + .name1 = "clear", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.clear_session) @@ -213,19 +213,19 @@ static virtual_server_compile_t const compile_list[] = { * Pseudonym processing */ { - .name = "store", + .name1 = "store", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.store_pseudonym) }, { - .name = "load", + .name1 = "load", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.load_pseudonym) }, { - .name = "clear", + .name1 = "clear", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.clear_pseudonym) diff --git a/src/process/eap_sim/base.c b/src/process/eap_sim/base.c index da67a4216f..f4f231da14 100644 --- a/src/process/eap_sim/base.c +++ b/src/process/eap_sim/base.c @@ -54,13 +54,13 @@ static virtual_server_compile_t compile_list[] = { * identities. */ { - .name = "recv", + .name1 = "recv", .name2 = "Identity-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_identity_response) }, { - .name = "send", + .name1 = "send", .name2 = "Identity-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_identity_request) @@ -72,13 +72,13 @@ static virtual_server_compile_t compile_list[] = { * request/response rounds. */ { - .name = "send", + .name1 = "send", .name2 = "Start-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_sim_start_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Start-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_sim_start_response) @@ -88,13 +88,13 @@ static virtual_server_compile_t compile_list[] = { * Full-Authentication */ { - .name = "send", + .name1 = "send", .name2 = "Challenge-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_sim_challenge_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Challenge-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_sim_challenge_response) @@ -104,13 +104,13 @@ static virtual_server_compile_t compile_list[] = { * Fast-Re-Authentication */ { - .name = "send", + .name1 = "send", .name2 = "Reauthentication-Request", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_reauthentication_request) }, { - .name = "recv", + .name1 = "recv", .name2 = "Reauthentication-Response", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_reauthentication_response) @@ -120,7 +120,7 @@ static virtual_server_compile_t compile_list[] = { * Failures originating from the supplicant */ { - .name = "recv", + .name1 = "recv", .name2 = "Client-Error", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_client_error) @@ -130,13 +130,13 @@ static virtual_server_compile_t compile_list[] = { * Failure originating from the server */ { - .name = "send", + .name1 = "send", .name2 = "Failure-Notification", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_failure_notification) }, { - .name = "recv", + .name1 = "recv", .name2 = "Failure-Notification-ACK", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_failure_notification_ack) @@ -146,13 +146,13 @@ static virtual_server_compile_t compile_list[] = { * Protected success indication */ { - .name = "send", + .name1 = "send", .name2 = "Success-Notification", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_common_success_notification) }, { - .name = "recv", + .name1 = "recv", .name2 = "Success-Notification-ACK", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.recv_common_success_notification_ack) @@ -162,13 +162,13 @@ static virtual_server_compile_t compile_list[] = { * Final EAP-Success and EAP-Failure messages */ { - .name = "send", + .name1 = "send", .name2 = "EAP-Success", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_eap_success) }, { - .name = "send", + .name1 = "send", .name2 = "EAP-Failure", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.send_eap_failure) @@ -178,19 +178,19 @@ static virtual_server_compile_t compile_list[] = { * Fast-Reauth vectors */ { - .name = "store", + .name1 = "store", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.store_session) }, { - .name = "load", + .name1 = "load", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.load_session) }, { - .name = "clear", + .name1 = "clear", .name2 = "session", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.clear_session) @@ -200,19 +200,19 @@ static virtual_server_compile_t compile_list[] = { * Pseudonym processing */ { - .name = "store", + .name1 = "store", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.store_pseudonym) }, { - .name = "load", + .name1 = "load", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.load_pseudonym) }, { - .name = "clear", + .name1 = "clear", .name2 = "pseudonym", .component = MOD_AUTHORIZE, .offset = offsetof(eap_aka_sim_process_conf_t, actions.clear_pseudonym) diff --git a/src/process/ldap_sync/base.c b/src/process/ldap_sync/base.c index 7e065aacab..f99f9c2065 100644 --- a/src/process/ldap_sync/base.c +++ b/src/process/ldap_sync/base.c @@ -195,37 +195,37 @@ static fr_process_state_t const process_state[] = { static virtual_server_compile_t const compile_list[] = { { - .name = "load", + .name1 = "load", .name2 = "Cookie", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(load_cookie) }, { - .name = "store", + .name1 = "store", .name2 = "Cookie", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(store_cookie) }, { - .name = "recv", + .name1 = "recv", .name2 = "Add", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(recv_add) }, { - .name = "recv", + .name1 = "recv", .name2 = "Present", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(recv_present) }, { - .name = "recv", + .name1 = "recv", .name2 = "Delete", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(recv_delete) }, { - .name = "recv", + .name1 = "recv", .name2 = "Modify", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(recv_modify) diff --git a/src/process/radius/base.c b/src/process/radius/base.c index 0a6f927cc6..ca55210d6c 100644 --- a/src/process/radius/base.c +++ b/src/process/radius/base.c @@ -1098,103 +1098,103 @@ static fr_process_state_t const process_state[] = { static virtual_server_compile_t const compile_list[] = { { - .name = "recv", + .name1 = "recv", .name2 = "Access-Request", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(access_request), }, { - .name = "send", + .name1 = "send", .name2 = "Access-Accept", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(access_accept), }, { - .name = "send", + .name1 = "send", .name2 = "Access-Challenge", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(access_challenge), }, { - .name = "send", + .name1 = "send", .name2 = "Access-Reject", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(access_reject), }, { - .name = "recv", + .name1 = "recv", .name2 = "Accounting-Request", .component = MOD_PREACCT, .offset = PROCESS_CONF_OFFSET(accounting_request), }, { - .name = "send", + .name1 = "send", .name2 = "Accounting-Response", .component = MOD_ACCOUNTING, .offset = PROCESS_CONF_OFFSET(accounting_response), }, { - .name = "recv", + .name1 = "recv", .name2 = "Status-Server", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(status_server), }, { - .name = "recv", + .name1 = "recv", .name2 = "CoA-Request", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(coa_request), }, { - .name = "send", + .name1 = "send", .name2 = "CoA-ACK", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(coa_ack), }, { - .name = "send",.name2 = "CoA-NAK", + .name1 = "send",.name2 = "CoA-NAK", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(coa_nak), }, { - .name = "recv", + .name1 = "recv", .name2 = "Disconnect-Request", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(disconnect_request), }, { - .name = "send", + .name1 = "send", .name2 = "Disconnect-ACK", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(disconnect_ack), }, { - .name = "send", + .name1 = "send", .name2 = "Disconnect-NAK", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(disconnect_nak), }, { - .name = "send", + .name1 = "send", .name2 = "Protocol-Error", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(protocol_error), }, { - .name = "send", + .name1 = "send", .name2 = "Do-Not-Respond", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(do_not_respond), }, { - .name = "authenticate", + .name1 = "authenticate", .name2 = CF_IDENT_ANY, .component = MOD_AUTHENTICATE }, { - .name = "accounting", + .name1 = "accounting", .name2 = CF_IDENT_ANY, .component = MOD_AUTHENTICATE }, diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c index 493fe3cb5a..fa25b28cbb 100644 --- a/src/process/tacacs/base.c +++ b/src/process/tacacs/base.c @@ -1322,68 +1322,68 @@ static virtual_server_compile_t compile_list[] = { * protocol. Pretty much everything they did was wrong. */ { - .name = "recv", + .name1 = "recv", .name2 = "Authentication-Start", .component = MOD_AUTHENTICATE, .offset = PROCESS_CONF_OFFSET(auth_start), }, { - .name = "send", + .name1 = "send", .name2 = "Authentication-Pass", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(auth_pass), }, { - .name = "send", + .name1 = "send", .name2 = "Authentication-Fail", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(auth_fail), }, { - .name = "send", + .name1 = "send", .name2 = "Authentication-GetData", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(auth_getdata), }, { - .name = "send", + .name1 = "send", .name2 = "Authentication-GetUser", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(auth_getuser), }, { - .name = "send", + .name1 = "send", .name2 = "Authentication-GetPass", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(auth_getpass), }, { - .name = "send", + .name1 = "send", .name2 = "Authentication-Restart", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(auth_restart), }, { - .name = "send", + .name1 = "send", .name2 = "Authentication-Error", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(auth_error), }, { - .name = "recv", + .name1 = "recv", .name2 = "Authentication-Continue", .component = MOD_AUTHENTICATE, .offset = PROCESS_CONF_OFFSET(auth_cont), }, { - .name = "recv", + .name1 = "recv", .name2 = "Authentication-Continue-Abort", .component = MOD_AUTHENTICATE, .offset = PROCESS_CONF_OFFSET(auth_cont_abort), }, { - .name = "authenticate", + .name1 = "authenticate", .name2 = CF_IDENT_ANY, .component = MOD_AUTHENTICATE, }, @@ -1391,31 +1391,31 @@ static virtual_server_compile_t compile_list[] = { /* authorization */ { - .name = "recv", + .name1 = "recv", .name2 = "Authorization-Request", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(autz_request), }, { - .name = "send", + .name1 = "send", .name2 = "Authorization-Pass-Add", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(autz_pass_add), }, { - .name = "send", + .name1 = "send", .name2 = "Authorization-Pass-Replace", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(autz_pass_replace), }, { - .name = "send", + .name1 = "send", .name2 = "Authorization-Fail", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(autz_fail), }, { - .name = "send", + .name1 = "send", .name2 = "Authorization-Error", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(autz_error), @@ -1424,32 +1424,32 @@ static virtual_server_compile_t compile_list[] = { /* accounting */ { - .name = "recv", + .name1 = "recv", .name2 = "Accounting-Request", .component = MOD_ACCOUNTING, .offset = PROCESS_CONF_OFFSET(acct_request), }, { - .name = "send", + .name1 = "send", .name2 = "Accounting-Success", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(acct_success), }, { - .name = "send", + .name1 = "send", .name2 = "Accounting-Error", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(acct_error), }, { - .name = "accounting", + .name1 = "accounting", .name2 = CF_IDENT_ANY, .component = MOD_ACCOUNTING, }, { - .name = "send", + .name1 = "send", .name2 = "Do-Not-Respond", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(do_not_respond), diff --git a/src/process/test/base.c b/src/process/test/base.c index 1a33ffdb79..08de97b3b4 100644 --- a/src/process/test/base.c +++ b/src/process/test/base.c @@ -105,13 +105,13 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc static const virtual_server_compile_t compile_list[] = { { - .name = "recv", + .name1 = "recv", .name2 = "Request", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(recv_request), }, { - .name = "send", + .name1 = "send", .name2 = "Reply", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(send_reply), diff --git a/src/process/tls/base.c b/src/process/tls/base.c index 936daa9509..d484ccdb05 100644 --- a/src/process/tls/base.c +++ b/src/process/tls/base.c @@ -152,25 +152,25 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc static const virtual_server_compile_t compile_list[] = { { - .name = "store", + .name1 = "store", .name2 = "session", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(store_session) }, { - .name = "load", + .name1 = "load", .name2 = "session", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(load_session) }, { - .name = "clear", + .name1 = "clear", .name2 = "session", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(clear_session) }, { - .name = "verify", + .name1 = "verify", .name2 = "certificate", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(verify_certificate) diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c index c90764cecb..7b1f79f2c6 100644 --- a/src/process/ttls/base.c +++ b/src/process/ttls/base.c @@ -620,44 +620,44 @@ static fr_process_state_t const process_state[] = { static virtual_server_compile_t const compile_list[] = { { - .name = "recv", + .name1 = "recv", .name2 = "Access-Request", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(access_request), }, { - .name = "send", + .name1 = "send", .name2 = "Access-Accept", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(access_accept), }, { - .name = "send", + .name1 = "send", .name2 = "Access-Challenge", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(access_challenge), }, { - .name = "send", + .name1 = "send", .name2 = "Access-Reject", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(access_reject), }, { - .name = "send", + .name1 = "send", .name2 = "Protocol-Error", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(protocol_error), }, { - .name = "send", + .name1 = "send", .name2 = "Do-Not-Respond", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(do_not_respond), }, { - .name = "authenticate", + .name1 = "authenticate", .name2 = CF_IDENT_ANY, .component = MOD_AUTHENTICATE }, diff --git a/src/process/vmps/base.c b/src/process/vmps/base.c index b602af1358..481df2cebf 100644 --- a/src/process/vmps/base.c +++ b/src/process/vmps/base.c @@ -228,31 +228,31 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc static const virtual_server_compile_t compile_list[] = { { - .name = "recv", + .name1 = "recv", .name2 = "Join-Request", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(join_request), }, { - .name = "send", + .name1 = "send", .name2 = "Join-Response", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(join_response), }, { - .name = "recv", + .name1 = "recv", .name2 = "Reconfirm-Request", .component = MOD_AUTHORIZE, .offset = PROCESS_CONF_OFFSET(reconfirm_request), }, { - .name = "send", + .name1 = "send", .name2 = "Reconfirm-Response", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(reconfirm_response), }, { - .name = "send", + .name1 = "send", .name2 = "Do-Not-Respond", .component = MOD_POST_AUTH, .offset = PROCESS_CONF_OFFSET(do_not_respond), -- 2.47.3