From 1a7823823eab04baacee140ebd45b380dcee9cef Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sun, 15 Jun 2008 11:11:14 -0400 Subject: [PATCH] Now that we pass down the event context, start removing calls to event_context_init() where possible (This used to be commit 412f7a98dd809306ac9f35003fce554e1e1252e7) --- source4/lib/ldb/common/ldb.c | 2 ++ source4/lib/ldb/ldb_ildap/ldb_ildap.c | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 3e725a5c093..22cd46d13f8 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -45,6 +45,8 @@ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx) int ret; ldb = talloc_zero(mem_ctx, struct ldb_context); + /* FIXME: Hack a new event context so that CMD line utilities work + * until we have them all converted */ if (ev_ctx == NULL) { ev_ctx = event_context_init(ldb); } diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index 478df3662df..d1677032f0b 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -760,14 +760,6 @@ static int ildb_connect(struct ldb_context *ldb, const char *url, event_ctx = ldb_get_event_context(ldb); - /* FIXME: We must make the event context an explicit parameter, but we - * need to build the events library separately first. Hack a new event - * context so that CMD line utilities work until we have them all - * converted */ - if (event_ctx == NULL) { - event_ctx = event_context_init(NULL); - } - ildb->ldap = ldap4_new_connection(ildb, ldb_get_opaque(ldb, "loadparm"), event_ctx); if (!ildb->ldap) { -- 2.34.1