diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 12:51:55 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 12:51:55 +0100 |
| commit | 3101cb888d5cbad785050b8491b138d683d444fb (patch) | |
| tree | 4afb829887f209cbf4564918c1a223fcb42dcb93 /source4/lib/registry/patchfile.c | |
| parent | 4590432d6290fd1c21a27ec5e6643d455e4fec69 (diff) | |
| download | samba-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.c')
| -rw-r--r-- | source4/lib/registry/patchfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c index 7903bea246..687fd4b91b 100644 --- a/source4/lib/registry/patchfile.c +++ b/source4/lib/registry/patchfile.c @@ -27,6 +27,7 @@ _PUBLIC_ WERROR reg_preg_diff_load(int fd, + struct smb_iconv_convenience *iconv_convenience, const struct reg_diff_callbacks *callbacks, void *callback_data); @@ -306,7 +307,7 @@ _PUBLIC_ WERROR reg_diff_load(const char *filename, #endif if (strncmp(hdr, "PReg", 4) == 0) { /* Must be a GPO Registry.pol file */ - return reg_preg_diff_load(fd, callbacks, callback_data); + return reg_preg_diff_load(fd, iconv_convenience, callbacks, callback_data); } else { /* Must be a normal .REG file */ return reg_dotreg_diff_load(fd, iconv_convenience, callbacks, callback_data); |