ldap: Use query->treq->request in request_mux and request_demux

diff --git a/src/lib/ldap/connection.c b/src/lib/ldap/connection.c
index ab76704d3de84c520fda2ff2b489875fc4197f3e..fe98b7eb86f309a7768a5f67aacee06de6fa5faf 100644 (file)
--- a/src/lib/ldap/connection.c
+++ b/src/lib/ldap/connection.c
@@ -682,7 +682,7 @@ static void ldap_trunk_request_mux(UNUSED fr_event_list_t *el, fr_trunk_connecti
                         *      If we are chasing a referral, referral_url will be populated and may
                         *      have a base dn or scope to override the original query
                         */
-                       status = fr_ldap_search_async(&query->msgid, query->request, &ldap_conn,
+                       status = fr_ldap_search_async(&query->msgid, query->treq->request, &ldap_conn,
                                                      (referral_url && referral_url->lud_dn) ?
                                                        referral_url->lud_dn : query->dn,
                                                      (referral_url && referral_url->lud_scope) ?
@@ -698,12 +698,16 @@ static void ldap_trunk_request_mux(UNUSED fr_event_list_t *el, fr_trunk_connecti
                        POPULATE_LDAP_CONTROLS(our_serverctrls, query->serverctrls);
                        POPULATE_LDAP_CONTROLS(our_clientctrls, query->clientctrls);
 
-                       status = fr_ldap_modify_async(&query->msgid, query->request, &ldap_conn, query->dn, query->mods, our_serverctrls, our_clientctrls);
+                       status = fr_ldap_modify_async(&query->msgid, query->treq->request,
+                                                     &ldap_conn, query->dn, query->mods,
+                                                     our_serverctrls, our_clientctrls);
                        break;
 
                default:
                        ERROR("Invalid LDAP query for trunk connection");
-                       goto error;
+               error:
+                       fr_trunk_request_signal_fail(query->treq);
+                       continue;
 
                }