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 bc708ba7e93697ed1b196357f2c951dc46ededda..5aafcba254a632e3f0a85904d5433d4cf1ee2d17 100644 (file)
--- 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 f49fd94ab021a5858299dbb6837ed747f1316c59..d2b9e2701703c7c2516a3eb04ae24ac1dd8d106e 100644 (file)
--- 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 c0ac23a35c1c7d02ba015c75a65d84d2ee753d22..e216e70be70bed319f0427be44fca898a8c3d2bd 100644 (file)
--- 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 5c25b5403d7047a6fd3339ed344a2cca77833a0b..5a33f8af49ed1cc60cba1f4a6adb55811811be90 100644 (file)
--- 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 cc65b7c2a9e508d9f38f81a10b030a73b531f055..c80bd3ff20d983091a76fb46e7014e56778c7e22 100644 (file)
--- 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;