No need for non-async LDAP modify now

diff --git a/src/lib/ldap/base.c b/src/lib/ldap/base.c
index 7e4ae24d55c321eb03f8ee082fedafcb33dcfe07..278f7ee3a3c9c1990625769cca081f83adb2e6a5 100644 (file)
--- a/src/lib/ldap/base.c
+++ b/src/lib/ldap/base.c
@@ -751,11 +751,6 @@ unlang_action_t fr_ldap_trunk_search(rlm_rcode_t *p_result,
  * @param[in] mods             to be performed.
  * @param[in] serverctrls      specific to this query.
  * @param[in] clientctrls      specific to this query.
- * @param[in] is_async         If true, will return UNLANG_ACTION_YIELD
- *                             and push a modify onto the unlang stack
- *                             for the current request.
- *                             If false, will perform a synchronous search
- *                             and provide the result in p_result.
  * @return
  *     - UNLANG_ACTION_FAIL on error.
  *     - UNLANG_ACTION_YIELD on success.
@@ -765,8 +760,7 @@ unlang_action_t fr_ldap_trunk_modify(rlm_rcode_t *p_result,
                                     TALLOC_CTX *ctx,
                                     fr_ldap_query_t **out, request_t *request, fr_ldap_thread_trunk_t *ttrunk,
                                     char const *dn, LDAPMod *mods[],
-                                    LDAPControl **serverctrls, LDAPControl **clientctrls,
-                                    bool is_async)
+                                    LDAPControl **serverctrls, LDAPControl **clientctrls)
 {
        unlang_action_t action;
        fr_ldap_query_t *query;
@@ -786,21 +780,13 @@ unlang_action_t fr_ldap_trunk_modify(rlm_rcode_t *p_result,
                return UNLANG_ACTION_FAIL;
        }
 
-       action = unlang_function_push(request, is_async ? NULL : ldap_trunk_query_start, ldap_trunk_query_results,
-                                     ldap_trunk_query_cancel, ~FR_SIGNAL_CANCEL, is_async ? UNLANG_SUB_FRAME : UNLANG_TOP_FRAME, query);
+       action = unlang_function_push(request, NULL, ldap_trunk_query_results, ldap_trunk_query_cancel,
+                                     ~FR_SIGNAL_CANCEL, UNLANG_SUB_FRAME, query);
 
        if (action == UNLANG_ACTION_FAIL) goto error;
 
        *out = query;
 
-       /*
-        *      Hack until everything is async
-        */
-       if (!is_async) {
-               *p_result = unlang_interpret_synchronous(unlang_interpret_event_list(request), request);
-               return UNLANG_ACTION_CALCULATE_RESULT;
-       }
-
        return UNLANG_ACTION_PUSHED_CHILD;
 }
 

diff --git a/src/lib/ldap/base.h b/src/lib/ldap/base.h
index cd4d740efb534ad2da3b6e490b4c1085566563e0..51d1eceec2822d150a2d90ed6112b025e79df150 100644 (file)
--- a/src/lib/ldap/base.h
+++ b/src/lib/ldap/base.h
@@ -711,8 +711,7 @@ unlang_action_t fr_ldap_trunk_modify(rlm_rcode_t *p_result,
                                     TALLOC_CTX *ctx,
                                     fr_ldap_query_t **out, request_t *request, fr_ldap_thread_trunk_t *ttrunk,
                                     char const *dn, LDAPMod *mods[],
-                                    LDAPControl **serverctrls, LDAPControl **clientctrls,
-                                    bool is_async);
+                                    LDAPControl **serverctrls, LDAPControl **clientctrls);
 
 /*
  *     base.c - Wrappers arounds OpenLDAP functions.

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 362fe84c202cfa1d9a6fe70de16999e5b5a30fa9..253268d88f6e7c189c22d6039879183c2b430d21 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -1721,7 +1721,7 @@ static unlang_action_t user_modify_resume(rlm_rcode_t *p_result, UNUSED int *pri
                                 UNLANG_SUB_FRAME, usermod_ctx) < 0) goto fail;
 
        return fr_ldap_trunk_modify(p_result, usermod_ctx, &usermod_ctx->query, request, usermod_ctx->ttrunk,
-                                   usermod_ctx->dn, modify, NULL, NULL, true);
+                                   usermod_ctx->dn, modify, NULL, NULL);
 }
 
 /** Modify user's object in LDAP