diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2008-09-09 18:03:54 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2008-09-09 18:03:54 +0200 |
| commit | 42ab865fc937a625d1eece45abe96bf354ddff8b (patch) | |
| tree | f3067eb411352626423d5531189d7ff067b0aecc | |
| parent | d1052dc42ef591208cfbf7059b28a078f6d4f0bf (diff) | |
| download | samba-42ab865fc937a625d1eece45abe96bf354ddff8b.tar.gz | |
Fix up the "reg_common_open_remote" call
This fixes up the "reg_common_open_remote" call because it didn't work anymore without the event context.
| -rw-r--r-- | source/lib/registry/tools/common.c | 3 | ||||
| -rw-r--r-- | source/lib/registry/tools/regpatch.c | 8 | ||||
| -rw-r--r-- | source/lib/registry/tools/regshell.c | 4 | ||||
| -rw-r--r-- | source/lib/registry/tools/regtree.c | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/source/lib/registry/tools/common.c b/source/lib/registry/tools/common.c index 3ea780de60a..f770f6a3caf 100644 --- a/source/lib/registry/tools/common.c +++ b/source/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/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c index 1170fbadb43..add59a5e64f 100644 --- a/source/lib/registry/tools/regpatch.c +++ b/source/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/source/lib/registry/tools/regshell.c b/source/lib/registry/tools/regshell.c index ee8f366e6e2..98f7f02c38c 100644 --- a/source/lib/registry/tools/regshell.c +++ b/source/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/source/lib/registry/tools/regtree.c b/source/lib/registry/tools/regtree.c index daca6957a1a..19e4a010b43 100644 --- a/source/lib/registry/tools/regtree.c +++ b/source/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 { |