Remove timeout event once we are calling the callback.

(Even if the callback takes some time, this isn't a ldb_tdb timeout
any more)

Andrew Bartlett

diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 34a4e0396573ff46448aef2d3d74776c8dcc8ea7..9e3ad80705fb08c20293d1564499aef740a25f05 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -1076,12 +1076,14 @@ static void ltdb_callback(struct event_context *ev,
        }
 
        if (!ctx->callback_failed) {
+               /* Once we are done, we do not need timeout events */
+               talloc_free(ctx->timeout_event);
                ltdb_request_done(ctx->req, ret);
        }
 }
 
 static int ltdb_handle_request(struct ldb_module *module,
-                               struct ldb_request *req)
+                              struct ldb_request *req)
 {
        struct event_context *ev;
        struct ltdb_context *ac;
@@ -1115,10 +1117,9 @@ static int ltdb_handle_request(struct ldb_module *module,
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-
        tv.tv_sec = req->starttime + req->timeout;
-       te = event_add_timed(ev, ac, tv, ltdb_timeout, ac);
-       if (NULL == te) {
+       ac->timeout_event = event_add_timed(ev, ac, tv, ltdb_timeout, ac);
+       if (NULL == ac->timeout_event) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 

diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index 61e90bccc69d99b0ce215365bf8f33f872c84432..c78a8172c72bd4625ffa38ca2e4270324a9819bf 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -50,6 +50,7 @@ struct ltdb_context {
        struct ldb_dn *base;
        enum ldb_scope scope;
        const char * const *attrs;
+       struct timed_event *timeout_event;
 };
 
 /* special record types */