Fix extended operation return path.

[ira/wip.git] / source4 / lib / ldb / ldb_tdb / ldb_tdb.c

diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index d38cb828bbe61e69c677251af7ab795634abf0a6..9df62be93631baad29a71c60aea97ad2d75a2761 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -1020,13 +1020,14 @@ static void ltdb_timeout(struct tevent_context *ev,
        ctx = talloc_get_type(private_data, struct ltdb_context);
 
        if (!ctx->request_terminated) {
-               /* neutralize the spy */
-               ctx->spy->ctx = NULL;
-
                /* request is done now */
                ltdb_request_done(ctx, LDB_ERR_TIME_LIMIT_EXCEEDED);
        }
 
+       if (!ctx->request_terminated) {
+               /* neutralize the spy */
+               ctx->spy->ctx = NULL;
+       }
        talloc_free(ctx);
 }
 
@@ -1086,10 +1087,9 @@ static void ltdb_callback(struct tevent_context *ev,
 
        ctx = talloc_get_type(private_data, struct ltdb_context);
 
-       if (!ctx->request_terminated) {
-               /* neutralize the spy */
-               ctx->spy->ctx = NULL;
-       } else goto done;
+       if (ctx->request_terminated) {
+               goto done;
+       }
 
        switch (ctx->req->operation) {
        case LDB_SEARCH:
@@ -1109,7 +1109,7 @@ static void ltdb_callback(struct tevent_context *ev,
                break;
        case LDB_EXTENDED:
                ltdb_handle_extended(ctx);
-               return;
+               goto done;
        default:
                /* no other op supported */
                ret = LDB_ERR_UNWILLING_TO_PERFORM;
@@ -1121,6 +1121,10 @@ static void ltdb_callback(struct tevent_context *ev,
        }
 
 done:
+       if (!ctx->request_terminated) {
+               /* neutralize the spy */
+               ctx->spy->ctx = NULL;
+       }
        talloc_free(ctx);
 }