diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-14 00:27:31 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:11 +0100 |
| commit | 96a200511e884a88dcf48fa5b313b2cddb2df566 (patch) | |
| tree | da89d150a2b706d096461d33b07674b25354634f /source4/lib/registry/tools | |
| parent | 2331f4e9a56baa00ab4f250d10416a072320b539 (diff) | |
| download | samba-96a200511e884a88dcf48fa5b313b2cddb2df566.tar.gz samba-96a200511e884a88dcf48fa5b313b2cddb2df566.tar.bz2 samba-96a200511e884a88dcf48fa5b313b2cddb2df566.zip | |
r26443: Remove global_loadparm instances.
(This used to be commit 8242c696235d1bfb402b5c276a57f36d93610545)
Diffstat (limited to 'source4/lib/registry/tools')
| -rw-r--r-- | source4/lib/registry/tools/common.c | 3 | ||||
| -rw-r--r-- | source4/lib/registry/tools/regshell.c | 2 | ||||
| -rw-r--r-- | source4/lib/registry/tools/regtree.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/registry/tools/common.c b/source4/lib/registry/tools/common.c index c9293cd310..29e96475e6 100644 --- a/source4/lib/registry/tools/common.c +++ b/source4/lib/registry/tools/common.c @@ -42,13 +42,14 @@ struct registry_context *reg_common_open_remote(const char *remote, } struct registry_key *reg_common_open_file(const char *path, + struct loadparm_context *lp_ctx, struct cli_credentials *creds) { struct hive_key *hive_root; struct registry_context *h; WERROR error; - error = reg_open_hive(NULL, path, NULL, creds, &hive_root); + error = reg_open_hive(NULL, path, NULL, creds, lp_ctx, &hive_root); if(!W_ERROR_IS_OK(error)) { fprintf(stderr, "Unable to open '%s': %s \n", diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index 2c692952fb..1c5157e937 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -500,7 +500,7 @@ int main(int argc, char **argv) ctx->registry = reg_common_open_remote(remote, cmdline_lp_ctx, cmdline_credentials); } else if (file != NULL) { - ctx->current = reg_common_open_file(file, cmdline_credentials); + ctx->current = reg_common_open_file(file, cmdline_lp_ctx, cmdline_credentials); if (ctx->current == NULL) return 1; ctx->registry = ctx->current->context; diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c index b267e11b43..0f47d8f8dd 100644 --- a/source4/lib/registry/tools/regtree.c +++ b/source4/lib/registry/tools/regtree.c @@ -131,7 +131,7 @@ int main(int argc, char **argv) if (remote != NULL) { h = reg_common_open_remote(remote, cmdline_lp_ctx, cmdline_credentials); } else if (file != NULL) { - start_key = reg_common_open_file(file, cmdline_credentials); + start_key = reg_common_open_file(file, cmdline_lp_ctx, cmdline_credentials); } else { h = reg_common_open_local(cmdline_credentials, cmdline_lp_ctx); } |