diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 12:45:46 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 12:45:46 +0100 |
| commit | c8011b5d09390318ea6aa5639a142797128e5dab (patch) | |
| tree | fb14b7ecce720dbc4fbba831a8fab045b9ac5f5c /source4/lib/registry/hive.c | |
| parent | bc1a369a0ed254ede591b65756d75568c45549ea (diff) | |
| parent | de4a2214efb3fcc1aa04664371983dbc768eaf79 (diff) | |
| download | samba-c8011b5d09390318ea6aa5639a142797128e5dab.tar.gz samba-c8011b5d09390318ea6aa5639a142797128e5dab.tar.xz samba-c8011b5d09390318ea6aa5639a142797128e5dab.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/scripting/python/config.mk
(This used to be commit 0ac0ea660ab63eca764149f1d2828d0238a57289)
Diffstat (limited to 'source4/lib/registry/hive.c')
| -rw-r--r-- | source4/lib/registry/hive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/registry/hive.c b/source4/lib/registry/hive.c index 5d56a30b3e..ad6a6421ab 100644 --- a/source4/lib/registry/hive.c +++ b/source4/lib/registry/hive.c @@ -22,6 +22,7 @@ #include "includes.h" #include "hive.h" #include "system/filesys.h" +#include "param/param.h" /** Open a registry file/host/etc */ _PUBLIC_ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *location, @@ -52,7 +53,7 @@ _PUBLIC_ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *location, if (!strncmp(peek, "regf", 4)) { close(fd); - return reg_open_regf_file(parent_ctx, location, lp_ctx, root); + return reg_open_regf_file(parent_ctx, location, lp_iconv_convenience(lp_ctx), root); } else if (!strncmp(peek, "TDB file", 8)) { close(fd); return reg_open_ldb_file(parent_ctx, location, session_info, |