From: Arran Cudbard-Bell Date: Thu, 25 Mar 2021 17:52:10 +0000 (+0000) Subject: Swap remaining bad calls to unlang_interpret to unlang_interpret_synchronous X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d228498ffc1251e8ba13ab2c6dfbfba27adb6ba0;p=thirdparty%2Ffreeradius-server.git Swap remaining bad calls to unlang_interpret to unlang_interpret_synchronous --- diff --git a/src/lib/server/trigger.c b/src/lib/server/trigger.c index bc708ba7e93..5aafcba254a 100644 --- a/src/lib/server/trigger.c +++ b/src/lib/server/trigger.c @@ -219,7 +219,7 @@ static unlang_action_t trigger_process(rlm_rcode_t *p_result, module_ctx_t const /* * Run the interpreter. */ - rcode = unlang_interpret(request); + rcode = unlang_interpret_synchronous(request); if (request->master_state == REQUEST_STOP_PROCESSING) { RETURN_MODULE_HANDLED; diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c index f49fd94ab02..d2b9e270170 100644 --- a/src/modules/proto_bfd/proto_bfd.c +++ b/src/modules/proto_bfd/proto_bfd.c @@ -1372,7 +1372,7 @@ static int bfd_process(bfd_state_t *session, bfd_packet_t *bfd) talloc_free(request); return 0; } - unlang_interpret(request); + unlang_interpret_synchronous(request); DEBUG("}"); /* diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c index c0ac23a35c1..e216e70be70 100644 --- a/src/modules/proto_ldap_sync/proto_ldap_sync.c +++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c @@ -421,7 +421,7 @@ static void request_running(request_t *request, fr_state_signal_t action) FALL_THROUGH; case REQUEST_RECV: - rcode = unlang_interpret(request); + rcode = unlang_interpret_synchronous(request); if (request->master_state == REQUEST_STOP_PROCESSING) goto done; diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c index 5c25b5403d7..5a33f8af49e 100644 --- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c +++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c @@ -105,12 +105,10 @@ static unlang_action_t mod_process_auth_type(rlm_rcode_t *p_result, UNUSED modul eap_session_t *eap_session = eap_session_get(request->parent); eap_round_t *eap_round = eap_session->this_round; - rcode = unlang_interpret(request); + rcode = unlang_interpret_synchronous(request); if (request->master_state == REQUEST_STOP_PROCESSING) return UNLANG_ACTION_STOP_PROCESSING; - if (rcode == RLM_MODULE_YIELD) return UNLANG_ACTION_YIELD; - if (rcode != RLM_MODULE_OK) { eap_round->request->code = FR_EAP_CODE_FAILURE; RETURN_MODULE_RCODE(rcode); diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c index cc65b7c2a9e..c80bd3ff20d 100644 --- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c +++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c @@ -433,7 +433,7 @@ static unlang_action_t mod_process_auth_type(rlm_rcode_t *p_result, module_ctx_t rlm_rcode_t rcode; eap_session_t *eap_session = eap_session_get(request->parent); - rcode = unlang_interpret(request); + rcode = unlang_interpret_synchronous(request); if (request->master_state == REQUEST_STOP_PROCESSING) return UNLANG_ACTION_STOP_PROCESSING;