summaryrefslogtreecommitdiff
path: root/source4/lib/registry
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-21 18:09:47 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-21 18:09:47 +0100
commit299265d47b5b2faac39fbf908c738f336ea21e67 (patch)
treeb447ce13b60bb9ca7753de910aa34edb103c43fd /source4/lib/registry
parent10169a203019445e6d325a5c1559de3c73782237 (diff)
downloadsamba-299265d47b5b2faac39fbf908c738f336ea21e67.tar.gz
samba-299265d47b5b2faac39fbf908c738f336ea21e67.tar.bz2
samba-299265d47b5b2faac39fbf908c738f336ea21e67.zip
Remove yet more global_loadparm instances.
(This used to be commit 5de88728ac5c567d3711d1ac6862bbdaced84b75)
Diffstat (limited to 'source4/lib/registry')
-rw-r--r--source4/lib/registry/patchfile.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c
index a4579010cd..7903bea246 100644
--- a/source4/lib/registry/patchfile.c
+++ b/source4/lib/registry/patchfile.c
@@ -273,6 +273,7 @@ _PUBLIC_ WERROR reg_generate_diff(struct registry_context *ctx1,
* Load diff file
*/
_PUBLIC_ WERROR reg_diff_load(const char *filename,
+ struct smb_iconv_convenience *iconv_convenience,
const struct reg_diff_callbacks *callbacks,
void *callback_data)
{
@@ -308,7 +309,7 @@ _PUBLIC_ WERROR reg_diff_load(const char *filename,
return reg_preg_diff_load(fd, callbacks, callback_data);
} else {
/* Must be a normal .REG file */
- return reg_dotreg_diff_load(fd, lp_iconv_convenience(global_loadparm), callbacks, callback_data);
+ return reg_dotreg_diff_load(fd, iconv_convenience, callbacks, callback_data);
}
}
@@ -442,5 +443,6 @@ _PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, const char *filenam
callbacks.del_all_values = reg_diff_apply_del_all_values;
callbacks.done = NULL;
- return reg_diff_load(filename, &callbacks, ctx);
+ return reg_diff_load(filename, lp_iconv_convenience(global_loadparm),
+ &callbacks, ctx);
}