Merge branch 'master' of git://git.samba.org/samba into convenience

[bbaumbach/samba-autobuild/.git] / source4 / lib / registry / ldb.c

diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c
index 9c1f59c4df6f75e28b6a39de651c33c4ca5fcbc2..c558805e049e11a2798d4d71541753918d0acc7b 100644 (file)
--- 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,9 +60,9 @@ 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(mem_ctx, iconv_convenience, CH_UTF8, CH_UTF16,
+                       convert_string_talloc(mem_ctx, CH_UTF8, CH_UTF16,
                                                     val->data, val->length,
-                                                    (void **)&data->data);
+                                                    (void **)&data->data, &data->length, false);
                else {
                        data->data = NULL;
                        data->length = 0;
@@ -72,7 +71,7 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx,
 
        case REG_BINARY:
                if (val != NULL)
-                       *data = *val;
+                       *data = data_blob_talloc(mem_ctx, val->data, val->length);
                else {
                        data->data = NULL;
                        data->length = 0;
@@ -86,7 +85,7 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx,
                break;
 
        default:
-               *data = *val;
+               *data = data_blob_talloc(mem_ctx, val->data, val->length);
                break;
        }
 }
@@ -106,10 +105,10 @@ static struct ldb_message *reg_ldb_pack_value(struct ldb_context *ctx,
        case REG_SZ:
        case REG_EXPAND_SZ:
                if (data.data[0] != '\0') {
-                       val.length = convert_string_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UTF8,
+                       convert_string_talloc(mem_ctx, CH_UTF16, CH_UTF8,
                                                   (void *)data.data,
                                                   data.length,
-                                                  (void **)&val.data);
+                                                  (void **)&val.data, &val.length, false);
                        ldb_msg_add_value(msg, "data", &val, NULL);
                } else {
                        ldb_msg_add_empty(msg, "data", LDB_FLAG_MOD_DELETE, NULL);
@@ -309,7 +308,7 @@ static WERROR ldb_get_default_value(TALLOC_CTX *mem_ctx, struct hive_key *k,
        struct ldb_result *res;
        int ret;
 
-       ret = ldb_search(c, kd->dn, LDB_SCOPE_BASE, "", attrs, &res);
+       ret = ldb_search(c, mem_ctx, &res, kd->dn, LDB_SCOPE_BASE, attrs, "%s", "");
 
        if (ret != LDB_SUCCESS) {
                DEBUG(0, ("Error getting default value for '%s': %s\n",
@@ -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;
 }
@@ -373,7 +371,7 @@ static WERROR ldb_get_value(TALLOC_CTX *mem_ctx, struct hive_key *k,
        } else {
                /* normal value */
                query = talloc_asprintf(mem_ctx, "(value=%s)", name);
-               ret = ldb_search(c, kd->dn, &res, LDB_SCOPE_ONELEVEL, query, NULL, "%s", query);
+               ret = ldb_search(c, mem_ctx, &res, kd->dn, LDB_SCOPE_ONELEVEL, NULL, "%s", query);
                talloc_free(query);
 
                if (ret != LDB_SUCCESS) {
@@ -385,13 +383,11 @@ 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);
        }
 
-       talloc_free(res);
        return WERR_OK;
 }
 
@@ -433,7 +429,7 @@ static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, const struct hive_key *h,
 WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
                         struct auth_session_info *session_info,
                         struct cli_credentials *credentials,
-                        struct event_context *ev_ctx,
+                        struct tevent_context *ev_ctx,
                         struct loadparm_context *lp_ctx,
                         struct hive_key **k)
 {
@@ -813,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);