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/regf.c | |
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/regf.c')
-rw-r--r-- | source4/lib/registry/regf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c index 8eb5760f56..210b4c9ada 100644 --- a/source4/lib/registry/regf.c +++ b/source4/lib/registry/regf.c @@ -1942,8 +1942,8 @@ WERROR reg_create_regf_file(TALLOC_CTX *parent_ctx, const char *location, return WERR_OK; } -WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, - const char *location, struct hive_key **key) +WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, const char *location, + struct loadparm_context *lp_ctx, struct hive_key **key) { struct regf_data *regf; struct regf_hdr *regf_hdr; @@ -1952,7 +1952,7 @@ WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, regf = (struct regf_data *)talloc_zero(NULL, struct regf_data); - regf->iconv_convenience = lp_iconv_convenience(global_loadparm); + regf->iconv_convenience = lp_iconv_convenience(lp_ctx); W_ERROR_HAVE_NO_MEMORY(regf); |