summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/lib/registry/tools/common.c3
-rw-r--r--source4/lib/registry/tools/regpatch.c8
-rw-r--r--source4/lib/registry/tools/regshell.c4
-rw-r--r--source4/lib/registry/tools/regtree.c2
4 files changed, 9 insertions, 8 deletions
diff --git a/source4/lib/registry/tools/common.c b/source4/lib/registry/tools/common.c
index 3ea780de60..f770f6a3ca 100644
--- a/source4/lib/registry/tools/common.c
+++ b/source4/lib/registry/tools/common.c
@@ -24,13 +24,14 @@
#include "lib/registry/tools/common.h"
struct registry_context *reg_common_open_remote(const char *remote,
+ struct event_context *ev_ctx,
struct loadparm_context *lp_ctx,
struct cli_credentials *creds)
{
struct registry_context *h = NULL;
WERROR error;
- error = reg_open_remote(&h, NULL, creds, lp_ctx, remote, NULL);
+ error = reg_open_remote(&h, NULL, creds, lp_ctx, remote, ev_ctx);
if (!W_ERROR_IS_OK(error)) {
fprintf(stderr, "Unable to open remote registry at %s:%s \n",
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 1170fbadb4..add59a5e64 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
struct registry_context *h;
const char *file = NULL;
const char *remote = NULL;
- struct event_context *ev;
+ struct event_context *ev_ctx;
struct poptOption long_options[] = {
POPT_AUTOHELP
{"remote", 'R', POPT_ARG_STRING, &remote, 0, "connect to specified remote server", NULL},
@@ -49,12 +49,12 @@ int main(int argc, char **argv)
while((opt = poptGetNextOpt(pc)) != -1) {
}
- ev = s4_event_context_init(NULL);
+ ev_ctx = s4_event_context_init(NULL);
if (remote) {
- h = reg_common_open_remote (remote, cmdline_lp_ctx, cmdline_credentials);
+ h = reg_common_open_remote (remote, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
} else {
- h = reg_common_open_local (cmdline_credentials, ev, cmdline_lp_ctx);
+ h = reg_common_open_local (cmdline_credentials, ev_ctx, cmdline_lp_ctx);
}
if (h == NULL)
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index ee8f366e6e..98f7f02c38 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -518,8 +518,8 @@ int main(int argc, char **argv)
ev_ctx = s4_event_context_init(ctx);
if (remote != NULL) {
- ctx->registry = reg_common_open_remote(remote, cmdline_lp_ctx,
- cmdline_credentials);
+ ctx->registry = reg_common_open_remote(remote, ev_ctx,
+ cmdline_lp_ctx, cmdline_credentials);
} else if (file != NULL) {
ctx->current = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
if (ctx->current == NULL)
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index daca6957a1..19e4a010b4 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -132,7 +132,7 @@ int main(int argc, char **argv)
ev_ctx = s4_event_context_init(NULL);
if (remote != NULL) {
- h = reg_common_open_remote(remote, cmdline_lp_ctx, cmdline_credentials);
+ h = reg_common_open_remote(remote, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
} else if (file != NULL) {
start_key = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
} else {