summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-03-12 10:05:05 +0100
committerStefan Metzmacher <metze@samba.org>2009-03-12 14:21:20 +0100
commit6802394212f7fefc21d1e2ad257fbeee26238b2d (patch)
tree373d15455342b27d1337ae679aeb842140d54c6c
parent06f88fe7a2f9ce93f8cdbec0910cc8471c12b1c3 (diff)
downloadsamba-6802394212f7fefc21d1e2ad257fbeee26238b2d.tar.gz
samba-6802394212f7fefc21d1e2ad257fbeee26238b2d.tar.bz2
samba-6802394212f7fefc21d1e2ad257fbeee26238b2d.zip
s4:ldb: allow nested events until the code is fixed to avoid them
metze
-rw-r--r--source4/lib/ldb/common/ldb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index e17e10dcaa..86ce2069a5 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -32,6 +32,7 @@
* Author: Andrew Tridgell
*/
+#define TEVENT_DEPRECATED 1
#include "ldb_private.h"
static int ldb_context_destructor(void *ptr)
@@ -56,7 +57,7 @@ static void ldb_tevent_debug(void *context, enum tevent_debug_level level,
static void ldb_tevent_debug(void *context, enum tevent_debug_level level,
const char *fmt, va_list ap)
{
- struct ldb_context = talloc_get_type_abort(context, struct ldb_context);
+ struct ldb_context *ldb = talloc_get_type(context, struct ldb_context);
enum ldb_debug_level ldb_level = LDB_DEBUG_FATAL;
char *s = NULL;
@@ -97,6 +98,7 @@ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx)
if (ev_ctx == NULL) {
ev_ctx = tevent_context_init(talloc_autofree_context());
tevent_set_debug(ev_ctx, ldb_tevent_debug, ldb);
+ tevent_loop_allow_nesting(ev_ctx);
}
ret = ldb_setup_wellknown_attributes(ldb);