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/hive.h | |
| parent | d70eafc5c635255feafc7121b381e7044ac11854 (diff) | |
| parent | afe8e533b9626fff8c59653972019d3f91bf136c (diff) | |
| download | samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.gz samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.xz samba-fc6bc92e116d3891671a77bc4564047eefd69f95.zip | |
Merge branch 'v4-0-trivial' into v4-0-test
(This used to be commit 6cbb241c05539cc62526a366094c9c472e6422a5)
Diffstat (limited to 'source4/lib/registry/hive.h')
| -rw-r--r-- | source4/lib/registry/hive.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/registry/hive.h b/source4/lib/registry/hive.h index 6d9a69c7c5..87f335663d 100644 --- a/source4/lib/registry/hive.h +++ b/source4/lib/registry/hive.h @@ -188,7 +188,7 @@ WERROR hive_key_flush(struct hive_key *key); WERROR reg_open_directory(TALLOC_CTX *parent_ctx, const char *location, struct hive_key **key); WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, - const char *location, struct loadparm_context *lp_ctx, + const char *location, struct smb_iconv_convenience *iconv_convenience, struct hive_key **key); WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location, struct auth_session_info *session_info, @@ -200,6 +200,7 @@ WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location, WERROR reg_create_directory(TALLOC_CTX *parent_ctx, const char *location, struct hive_key **key); WERROR reg_create_regf_file(TALLOC_CTX *parent_ctx, + struct smb_iconv_convenience *iconv_convenience, const char *location, int major_version, struct hive_key **key); |