Merge branch 'v4-0-test' into id10ts-registry
[samba.git] / source4 / lib / registry / regf.c
index 6a35799a7e12200f4d761ca105e4308cde1c45ef..a192f3be4ddc14c656435552d22ce3b0ed7d356a 100644 (file)
@@ -1908,7 +1908,9 @@ static WERROR regf_save_hbin(struct regf_data *regf)
        return WERR_OK;
 }
 
-WERROR reg_create_regf_file(TALLOC_CTX *parent_ctx, const char *location,
+WERROR reg_create_regf_file(TALLOC_CTX *parent_ctx, 
+                           struct smb_iconv_convenience *iconv_convenience,
+                           const char *location,
                            int minor_version, struct hive_key **key)
 {
        struct regf_data *regf;
@@ -1919,7 +1921,7 @@ WERROR reg_create_regf_file(TALLOC_CTX *parent_ctx, const char *location,
 
        regf = (struct regf_data *)talloc_zero(NULL, struct regf_data);
 
-       regf->iconv_convenience = lp_iconv_convenience(global_loadparm);
+       regf->iconv_convenience = iconv_convenience;
 
        W_ERROR_HAVE_NO_MEMORY(regf);
 
@@ -1995,7 +1997,7 @@ WERROR reg_create_regf_file(TALLOC_CTX *parent_ctx, const char *location,
 }
 
 WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, const char *location, 
-                         struct loadparm_context *lp_ctx, struct hive_key **key)
+                         struct smb_iconv_convenience *iconv_convenience, struct hive_key **key)
 {
        struct regf_data *regf;
        struct regf_hdr *regf_hdr;
@@ -2004,7 +2006,7 @@ WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, const char *location,
 
        regf = (struct regf_data *)talloc_zero(NULL, struct regf_data);
 
-       regf->iconv_convenience = lp_iconv_convenience(lp_ctx);
+       regf->iconv_convenience = iconv_convenience;
 
        W_ERROR_HAVE_NO_MEMORY(regf);