summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-23 16:17:58 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-23 16:17:58 +0200
commita255c9399518419b1028abac09fb9e0c1d572403 (patch)
tree563446da29303b5b2f3ce63133d1568a9c1fbb25 /source4
parent33231f44da6c4eeb5dbf5e7d6d04237d32a63457 (diff)
downloadsamba-a255c9399518419b1028abac09fb9e0c1d572403.tar.gz
samba-a255c9399518419b1028abac09fb9e0c1d572403.tar.bz2
samba-a255c9399518419b1028abac09fb9e0c1d572403.zip
Cope with new event context parameter in API and removed parameters to reg_open_local().
(This used to be commit 0d5752c940360a0ceb5e23cd6f71cbc61271137a)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/registry/tests/diff.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/registry/tests/diff.c b/source4/lib/registry/tests/diff.c
index c7726545f6..44ea090527 100644
--- a/source4/lib/registry/tests/diff.c
+++ b/source4/lib/registry/tests/diff.c
@@ -165,10 +165,10 @@ static bool diff_setup_tcase(struct torture_context *tctx, void **data)
td = talloc(tctx, struct diff_tcase_data);
/* Create two registry contexts */
- error = reg_open_local(tctx, &r1_ctx, NULL, NULL);
+ error = reg_open_local(tctx, &r1_ctx);
torture_assert_werr_ok(tctx, error, "Opening registry 1 for patch tests failed");
- error = reg_open_local(tctx, &r2_ctx, NULL, NULL);
+ error = reg_open_local(tctx, &r2_ctx);
torture_assert_werr_ok(tctx, error, "Opening registry 2 for patch tests failed");
/* Create temp directory */
@@ -177,14 +177,14 @@ static bool diff_setup_tcase(struct torture_context *tctx, void **data)
/* Create and mount HKLM and HKCU hives for registry 1 */
filename = talloc_asprintf(tctx, "%s/r1_local_machine.ldb", td->tempdir);
- error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->lp_ctx, &r1_hklm);
+ error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->ev, tctx->lp_ctx, &r1_hklm);
torture_assert_werr_ok(tctx, error, "Opening local machine file failed");
error = reg_mount_hive(r1_ctx, r1_hklm, HKEY_LOCAL_MACHINE, NULL);
torture_assert_werr_ok(tctx, error, "Mounting hive failed");
filename = talloc_asprintf(tctx, "%s/r1_current_user.ldb", td->tempdir);
- error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->lp_ctx, &r1_hkcu);
+ error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->ev, tctx->lp_ctx, &r1_hkcu);
torture_assert_werr_ok(tctx, error, "Opening current user file failed");
error = reg_mount_hive(r1_ctx, r1_hkcu, HKEY_CURRENT_USER, NULL);
@@ -192,14 +192,14 @@ static bool diff_setup_tcase(struct torture_context *tctx, void **data)
/* Create and mount HKLM and HKCU hives for registry 2 */
filename = talloc_asprintf(tctx, "%s/r2_local_machine.ldb", td->tempdir);
- error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->lp_ctx, &r2_hklm);
+ error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->ev, tctx->lp_ctx, &r2_hklm);
torture_assert_werr_ok(tctx, error, "Opening local machine file failed");
error = reg_mount_hive(r2_ctx, r2_hklm, HKEY_LOCAL_MACHINE, NULL);
torture_assert_werr_ok(tctx, error, "Mounting hive failed");
filename = talloc_asprintf(tctx, "%s/r2_current_user.ldb", td->tempdir);
- error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->lp_ctx, &r2_hkcu);
+ error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->ev, tctx->lp_ctx, &r2_hkcu);
torture_assert_werr_ok(tctx, error, "Opening current user file failed");
error = reg_mount_hive(r2_ctx, r2_hkcu, HKEY_CURRENT_USER, NULL);