diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 16:01:19 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 16:01:19 +0100 |
commit | 48307b54f95395fbd201d92d738b482f80cd15ef (patch) | |
tree | fde46141ad4c47fe726718a19e68743227ef56c0 /source4/lib/registry/patchfile.c | |
parent | 263a77c5618daddb0c1e4f0ad0a922bca55faf0d (diff) | |
download | samba-48307b54f95395fbd201d92d738b482f80cd15ef.tar.gz samba-48307b54f95395fbd201d92d738b482f80cd15ef.tar.bz2 samba-48307b54f95395fbd201d92d738b482f80cd15ef.zip |
Remove more uses of global_loadparm.
(This used to be commit 3430cc60972b94d0d238bc39f473feed96949c5d)
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); } } |