diff options
| author | Simo Sorce <idra@samba.org> | 2008-06-15 11:11:14 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-06-15 11:11:14 -0400 |
| commit | 1a7823823eab04baacee140ebd45b380dcee9cef (patch) | |
| tree | be2b0c8ba364b610f9874c2c3a61094512347a6e /source4/lib/ldb | |
| parent | 4d8804f26cc554fe3a7bec78d09738ff1bbda7f7 (diff) | |
| download | samba-1a7823823eab04baacee140ebd45b380dcee9cef.tar.gz samba-1a7823823eab04baacee140ebd45b380dcee9cef.tar.bz2 samba-1a7823823eab04baacee140ebd45b380dcee9cef.zip | |
Now that we pass down the event context, start removing calls to
event_context_init() where possible
(This used to be commit 412f7a98dd809306ac9f35003fce554e1e1252e7)
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 2 | ||||
| -rw-r--r-- | 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 3e725a5c09..22cd46d13f 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 478df3662d..d1677032f0 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) { |