diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-04-17 15:21:08 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-04-17 15:21:08 +0200 |
| commit | dc74e0fad683cb0ef9ee5996aedadd4c377a0f00 (patch) | |
| tree | e33375abeb4ec70f646e420adfe9221e1bb87a2d /source4/lib/registry/tools/regshell.c | |
| parent | 11703b298685c9984a6a3c3a64eddb8a1a516b90 (diff) | |
| parent | ef457187b4372f039f84fbb4f6e4f0fcffd67b5b (diff) | |
| download | samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.gz samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.bz2 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/tools/regshell.c')
| -rw-r--r-- | source4/lib/registry/tools/regshell.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index 58f64cb049..80eafcc4a2 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -498,6 +498,7 @@ int main(int argc, char **argv) poptContext pc; const char *remote = NULL; struct regshell_context *ctx; + struct event_context *ev_ctx; bool ret = true; struct poptOption long_options[] = { POPT_AUTOHELP @@ -516,17 +517,19 @@ int main(int argc, char **argv) ctx = talloc_zero(NULL, struct regshell_context); + ev_ctx = event_context_init(ctx); + if (remote != NULL) { ctx->registry = reg_common_open_remote(remote, cmdline_lp_ctx, cmdline_credentials); } else if (file != NULL) { - ctx->current = reg_common_open_file(file, cmdline_lp_ctx, cmdline_credentials); + ctx->current = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx, cmdline_credentials); if (ctx->current == NULL) return 1; ctx->registry = ctx->current->context; ctx->path = talloc_strdup(ctx, ""); } else { - ctx->registry = reg_common_open_local(cmdline_credentials, cmdline_lp_ctx); + ctx->registry = reg_common_open_local(cmdline_credentials, ev_ctx, cmdline_lp_ctx); } if (ctx->registry == NULL) |