summaryrefslogtreecommitdiff
path: root/source4/lib/registry/patchfile_dotreg.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-25 12:51:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-25 12:51:55 +0100
commit3101cb888d5cbad785050b8491b138d683d444fb (patch)
tree4afb829887f209cbf4564918c1a223fcb42dcb93 /source4/lib/registry/patchfile_dotreg.c
parent4590432d6290fd1c21a27ec5e6643d455e4fec69 (diff)
downloadsamba-3101cb888d5cbad785050b8491b138d683d444fb.tar.gz
samba-3101cb888d5cbad785050b8491b138d683d444fb.tar.bz2
samba-3101cb888d5cbad785050b8491b138d683d444fb.zip
Remove uses of global_loadparm.
(This used to be commit a16c9a2129ce92e7e1a613b2badd168e42ead436)
Diffstat (limited to 'source4/lib/registry/patchfile_dotreg.c')
-rw-r--r--source4/lib/registry/patchfile_dotreg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/registry/patchfile_dotreg.c b/source4/lib/registry/patchfile_dotreg.c
index 46ea7c0008..6de642ecb8 100644
--- a/source4/lib/registry/patchfile_dotreg.c
+++ b/source4/lib/registry/patchfile_dotreg.c
@@ -101,6 +101,7 @@ static WERROR reg_dotreg_diff_del_all_values(void *callback_data,
* Save registry diff
*/
_PUBLIC_ WERROR reg_dotreg_diff_save(TALLOC_CTX *ctx, const char *filename,
+ struct smb_iconv_convenience *iconv_convenience,
struct reg_diff_callbacks **callbacks,
void **callback_data)
{
@@ -109,7 +110,7 @@ _PUBLIC_ WERROR reg_dotreg_diff_save(TALLOC_CTX *ctx, const char *filename,
data = talloc_zero(ctx, struct dotreg_data);
*callback_data = data;
- data->iconv_convenience = lp_iconv_convenience(global_loadparm);
+ data->iconv_convenience = iconv_convenience;
if (filename) {
data->fd = open(filename, O_CREAT, 0755);