From: Simo Sorce <idra@samba.org>
Date: Sun, 15 Jun 2008 15:11:14 +0000 (-0400)
Subject: Now that we pass down the event context, start removing calls to
X-Git-Tag: samba-4.0.0alpha5~52^2~1
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=412f7a98dd809306ac9f35003fce554e1e1252e7;p=samba.git

Now that we pass down the event context, start removing calls to
event_context_init() where possible
---

diff --git a/source/lib/ldb/common/ldb.c b/source/lib/ldb/common/ldb.c
index 3e725a5c093..22cd46d13f8 100644
--- a/source/lib/ldb/common/ldb.c
+++ b/source/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/source/lib/ldb/ldb_ildap/ldb_ildap.c b/source/lib/ldb/ldb_ildap/ldb_ildap.c
index 478df3662df..d1677032f0b 100644
--- a/source/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source/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) {