Correct conditions for reparenting query when cancelling trunk request

diff --git a/src/lib/ldap/base.c b/src/lib/ldap/base.c
index 20294891838a919b333e0b337602e855e6dbc979..39cd3e5bfe3aaf72e7b41bb62a33a46e531a9a80 100644 (file)
--- a/src/lib/ldap/base.c
+++ b/src/lib/ldap/base.c
@@ -650,10 +650,24 @@ static void ldap_trunk_query_cancel(UNUSED request_t *request, UNUSED fr_signal_
        if (!query->treq) return;
 
        /*
-        *      The query needs to be parented by the treq so that it still
-        *      exists when the cancel_mux callback is run.
+        *      Depending on the state of the trunk request, the query needs to
+        *      be parented by the treq so that it still exists when the
+        *      cancel_mux callback is run.
+        *      Other states free the trunk request (and its children) immediately.
+        *      So no re-parenting is needed.
         */
-       talloc_steal(query->treq, query);
+       switch (query->treq->state) {
+       case TRUNK_REQUEST_STATE_PARTIAL:
+       case TRUNK_REQUEST_STATE_SENT:
+       case TRUNK_REQUEST_STATE_CANCEL:
+       case TRUNK_REQUEST_STATE_CANCEL_PARTIAL:
+       case TRUNK_REQUEST_STATE_CANCEL_SENT:
+       case TRUNK_REQUEST_STATE_CANCEL_COMPLETE:
+               talloc_steal(query->treq, query);
+               break;
+       default:
+               break;
+       }
 
        trunk_request_signal_cancel(query->treq);