summaryrefslogtreecommitdiffstats
path: root/source4/lib/registry/ldb.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-04-17 15:21:08 +0200
committerAndrew Tridgell <tridge@samba.org>2008-04-17 15:21:08 +0200
commitdc74e0fad683cb0ef9ee5996aedadd4c377a0f00 (patch)
treee33375abeb4ec70f646e420adfe9221e1bb87a2d /source4/lib/registry/ldb.c
parent11703b298685c9984a6a3c3a64eddb8a1a516b90 (diff)
parentef457187b4372f039f84fbb4f6e4f0fcffd67b5b (diff)
downloadsamba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.gz
samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.xz
samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3ab9abf40605a4a6b220faeebaef81546a8d87a0)
Diffstat (limited to 'source4/lib/registry/ldb.c')
-rw-r--r--source4/lib/registry/ldb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c
index a764ca6235..a8a9ed597e 100644
--- a/source4/lib/registry/ldb.c
+++ b/source4/lib/registry/ldb.c
@@ -357,6 +357,7 @@ static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, const struct hive_key *h,
WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
struct auth_session_info *session_info,
struct cli_credentials *credentials,
+ struct event_context *ev_ctx,
struct loadparm_context *lp_ctx,
struct hive_key **k)
{
@@ -367,7 +368,7 @@ WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
if (location == NULL)
return WERR_INVALID_PARAM;
- wrap = ldb_wrap_connect(parent_ctx, lp_ctx,
+ wrap = ldb_wrap_connect(parent_ctx, ev_ctx, lp_ctx,
location, session_info, credentials, 0, NULL);
if (wrap == NULL) {