summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-10-23 14:46:34 +1100
committerAndrew Tridgell <tridge@samba.org>2009-10-23 14:52:18 +1100
commit906961cd8ce4a68117fbb5dc96bfb4f5379daa5b (patch)
tree776cb1a2057591f729873008a5fc20b0a6ab15da
parenta32b3386473e40ec8b94703f66f731a29dba68f7 (diff)
downloadsamba-906961cd8ce4a68117fbb5dc96bfb4f5379daa5b.tar.gz
samba-906961cd8ce4a68117fbb5dc96bfb4f5379daa5b.tar.bz2
samba-906961cd8ce4a68117fbb5dc96bfb4f5379daa5b.zip
s4-ldb: use ldb_wrap_fork_hook() to cancel child transactions
-rw-r--r--source4/lib/ldb_wrap.c6
-rw-r--r--source4/min_versions.m42
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/lib/ldb_wrap.c b/source4/lib/ldb_wrap.c
index 0427a9c378..1166acd3a2 100644
--- a/source4/lib/ldb_wrap.c
+++ b/source4/lib/ldb_wrap.c
@@ -260,6 +260,10 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
*/
void ldb_wrap_fork_hook(void)
{
-
+ struct ldb_wrap *w;
+
+ for (w=ldb_wrap_list; w; w=w->next) {
+ ldb_transaction_cancel_noerr(w->ldb);
+ }
}
diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
index 6e49783778..34abaedbc9 100644
--- a/source4/min_versions.m4
+++ b/source4/min_versions.m4
@@ -2,5 +2,5 @@
# if we use the ones installed in the system.
define(TDB_MIN_VERSION,1.1.7)
define(TALLOC_MIN_VERSION,2.0.0)
-define(LDB_REQUIRED_VERSION,0.9.7)
+define(LDB_REQUIRED_VERSION,0.9.8)
define(TEVENT_REQUIRED_VERSION,0.9.8)