diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-10 00:05:37 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-10 00:05:37 +0200 |
| commit | 96ba74ba07d257c5ee24aee1428cc5f8f539d269 (patch) | |
| tree | bb7b576325a4b3c495ddf3da7181283d7eae2721 /source4/lib/registry/tools/regpatch.c | |
| parent | 4f266dff13d2937b1800954a9ddb536df4d14a5f (diff) | |
| parent | 3911808323c964c36c2639f68d59d7aca1a2a96b (diff) | |
| download | samba-96ba74ba07d257c5ee24aee1428cc5f8f539d269.tar.gz samba-96ba74ba07d257c5ee24aee1428cc5f8f539d269.tar.bz2 samba-96ba74ba07d257c5ee24aee1428cc5f8f539d269.zip | |
Merge branch 'v4-0-regClient' of git://repo.or.cz/Samba/mdw into manpage
(This used to be commit 6ac32d0a10a9a27abceca362fcab04bcfc55c33f)
Diffstat (limited to 'source4/lib/registry/tools/regpatch.c')
| -rw-r--r-- | source4/lib/registry/tools/regpatch.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) |