diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:31:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:31:16 +0200 |
| commit | 56a0b035c676af73eaa93446132e930cc95fae94 (patch) | |
| tree | 69ec6f153c97f41875a8e77b8f4fdf16a93a7546 /source4/lib/registry/ldb.c | |
| parent | 37d885c51a559d2be7dd15f46a80027e4f1dffef (diff) | |
| download | samba-56a0b035c676af73eaa93446132e930cc95fae94.tar.gz samba-56a0b035c676af73eaa93446132e930cc95fae94.tar.bz2 samba-56a0b035c676af73eaa93446132e930cc95fae94.zip | |
Remove more uses of global_loadparm.
Diffstat (limited to 'source4/lib/registry/ldb.c')
| -rw-r--r-- | source4/lib/registry/ldb.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c index bf1ec31f56..87268ce5e7 100644 --- a/source4/lib/registry/ldb.c +++ b/source4/lib/registry/ldb.c @@ -38,7 +38,6 @@ struct ldb_key_data }; static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *iconv_convenience, struct ldb_message *msg, const char **name, uint32_t *type, DATA_BLOB *data) @@ -61,7 +60,7 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, case REG_SZ: case REG_EXPAND_SZ: if (val != NULL) - data->length = convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UTF8, CH_UTF16, + data->length = convert_string_talloc(mem_ctx, CH_UTF8, CH_UTF16, val->data, val->length, (void **)&data->data); else { @@ -320,7 +319,7 @@ static WERROR ldb_get_default_value(TALLOC_CTX *mem_ctx, struct hive_key *k, if (res->count == 0 || res->msgs[0]->num_elements == 0) return WERR_BADFILE; - reg_ldb_unpack_value(mem_ctx, lp_iconv_convenience(global_loadparm), + reg_ldb_unpack_value(mem_ctx, res->msgs[0], name, data_type, data); talloc_free(res); @@ -351,8 +350,7 @@ static WERROR ldb_get_value_by_id(TALLOC_CTX *mem_ctx, struct hive_key *k, if (idx >= kd->value_count) return WERR_NO_MORE_ITEMS; - reg_ldb_unpack_value(mem_ctx, lp_iconv_convenience(global_loadparm), - kd->values[idx], name, data_type, data); + reg_ldb_unpack_value(mem_ctx, kd->values[idx], name, data_type, data); return WERR_OK; } @@ -385,8 +383,7 @@ static WERROR ldb_get_value(TALLOC_CTX *mem_ctx, struct hive_key *k, if (res->count == 0) return WERR_BADFILE; - reg_ldb_unpack_value(mem_ctx, lp_iconv_convenience(global_loadparm), - res->msgs[0], NULL, data_type, data); + reg_ldb_unpack_value(mem_ctx, res->msgs[0], NULL, data_type, data); talloc_free(res); } @@ -812,7 +809,6 @@ static WERROR ldb_get_key_info(TALLOC_CTX *mem_ctx, uint32_t data_type; DATA_BLOB data; reg_ldb_unpack_value(mem_ctx, - lp_iconv_convenience(global_loadparm), kd->values[i], NULL, &data_type, &data); *max_valbufsize = MAX(*max_valbufsize, data.length); |