diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 12:58:09 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 12:58:09 +0100 |
| commit | 584c4a518f4d18452b6515db132e4f75fba733a1 (patch) | |
| tree | bbe367f36f092f233d7aefb61d75d5d1e1e85031 /source4/lib/registry/patchfile.c | |
| parent | 03ab8f9d79f2a06b357b2f5d392ea8b5be263c5e (diff) | |
| parent | 71943b209b181e1e4a65ab477b83780add7051ae (diff) | |
| download | samba-584c4a518f4d18452b6515db132e4f75fba733a1.tar.gz samba-584c4a518f4d18452b6515db132e4f75fba733a1.tar.bz2 samba-584c4a518f4d18452b6515db132e4f75fba733a1.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/build/smb_build/header.pm
source/build/smb_build/makefile.pm
source/lib/ldb/include/ldb_private.h
(This used to be commit 1a646af0647f021d99473a8991c35e616a423ea6)
Diffstat (limited to 'source4/lib/registry/patchfile.c')
| -rw-r--r-- | source4/lib/registry/patchfile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c index fa1367bbd2..a4579010cd 100644 --- a/source4/lib/registry/patchfile.c +++ b/source4/lib/registry/patchfile.c @@ -23,6 +23,7 @@ #include "lib/registry/patchfile.h" #include "lib/registry/registry.h" #include "system/filesys.h" +#include "param/param.h" _PUBLIC_ WERROR reg_preg_diff_load(int fd, @@ -30,6 +31,7 @@ _PUBLIC_ WERROR reg_preg_diff_load(int fd, void *callback_data); _PUBLIC_ WERROR reg_dotreg_diff_load(int fd, + struct smb_iconv_convenience *iconv_convenience, const struct reg_diff_callbacks *callbacks, void *callback_data); @@ -306,7 +308,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, callbacks, callback_data); + return reg_dotreg_diff_load(fd, lp_iconv_convenience(global_loadparm), callbacks, callback_data); } } |