diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-28 18:27:29 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-28 18:27:29 +0100 |
| commit | fc6bc92e116d3891671a77bc4564047eefd69f95 (patch) | |
| tree | 9fd31f538af9cea9f144ece7e7b7cd2333d2bd81 /source4/lib/registry/patchfile_dotreg.c | |
| parent | d70eafc5c635255feafc7121b381e7044ac11854 (diff) | |
| parent | afe8e533b9626fff8c59653972019d3f91bf136c (diff) | |
| download | samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.gz samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.bz2 samba-fc6bc92e116d3891671a77bc4564047eefd69f95.zip | |
Merge branch 'v4-0-trivial' into v4-0-test
(This used to be commit 6cbb241c05539cc62526a366094c9c472e6422a5)
Diffstat (limited to 'source4/lib/registry/patchfile_dotreg.c')
| -rw-r--r-- | source4/lib/registry/patchfile_dotreg.c | 3 |
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); |