diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 22:32:11 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:15 +0100 |
| commit | 6c999cd12344f2bb8b1d2941210b4c205b3e0aad (patch) | |
| tree | 0911e4ca75694e080173c2863e2c41ff5881309c /source4/lib/registry/tools/regdiff.c | |
| parent | 934e932387ea5668ec000bcefe4ec86935297339 (diff) | |
| download | samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.tar.gz samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.tar.bz2 samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.zip | |
r26236: Remove more uses of global_loadparm or specify loadparm_context explicitly.
(This used to be commit 5b29ef7c03d9ae76b0ca909e9f03a58e1bad3521)
Diffstat (limited to 'source4/lib/registry/tools/regdiff.c')
| -rw-r--r-- | source4/lib/registry/tools/regdiff.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c index f96761cda0..1996861a2a 100644 --- a/source4/lib/registry/tools/regdiff.c +++ b/source4/lib/registry/tools/regdiff.c @@ -24,10 +24,12 @@ #include "lib/events/events.h" #include "lib/cmdline/popt_common.h" #include "lib/registry/tools/common.h" +#include "param/param.h" enum reg_backend { REG_UNKNOWN, REG_LOCAL, REG_REMOTE, REG_NULL }; static struct registry_context *open_backend(poptContext pc, + struct loadparm_context *lp_ctx, enum reg_backend backend, const char *remote_host) { @@ -39,7 +41,7 @@ static struct registry_context *open_backend(poptContext pc, poptPrintUsage(pc, stderr, 0); return NULL; case REG_LOCAL: - error = reg_open_samba(NULL, &ctx, NULL, cmdline_credentials); + error = reg_open_samba(NULL, &ctx, lp_ctx, NULL, cmdline_credentials); break; case REG_REMOTE: error = reg_open_remote(&ctx, NULL, cmdline_credentials, @@ -114,11 +116,11 @@ int main(int argc, const char **argv) } - h1 = open_backend(pc, backend1, remote1); + h1 = open_backend(pc, global_loadparm, backend1, remote1); if (h1 == NULL) return 1; - h2 = open_backend(pc, backend2, remote2); + h2 = open_backend(pc, global_loadparm, backend2, remote2); if (h2 == NULL) return 1; |