s4-registry: fixed byte order assumptions

[ira/wip.git] / source4 / lib / registry / ldb.c

diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c
index 41fbd22335fddb520a3b13f8dbf16414fe9355bd..d70489ac03a53f4ebd491de1d370d3d90f33de25 100644 (file)
--- a/source4/lib/registry/ldb.c
+++ b/source4/lib/registry/ldb.c
@@ -60,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, CH_UTF8, CH_UTF16,
+                       convert_string_talloc(mem_ctx, CH_UTF8, CH_UTF16,
                                                     val->data, val->length,
-                                                    (void **)&data->data, false);
+                                                    (void **)&data->data, &data->length, false);
                else {
                        data->data = NULL;
                        data->length = 0;
@@ -80,7 +80,8 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx,
 
        case REG_DWORD: {
                uint32_t tmp = strtoul((char *)val->data, NULL, 0);
-               *data = data_blob_talloc(mem_ctx, &tmp, 4);
+               *data = data_blob_talloc(mem_ctx, NULL, 4);
+               SIVAL(data->data, 0, tmp);
                }
                break;
 
@@ -105,10 +106,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, CH_UTF16, CH_UTF8,
+                       convert_string_talloc(mem_ctx, CH_UTF16, CH_UTF8,
                                                   (void *)data.data,
                                                   data.length,
-                                                  (void **)&val.data, false);
+                                                  (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);
@@ -441,7 +442,7 @@ WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
                return WERR_INVALID_PARAM;
 
        wrap = ldb_wrap_connect(parent_ctx, ev_ctx, lp_ctx,
-                               location, session_info, credentials, 0, NULL);
+                               location, session_info, credentials, 0);
 
        if (wrap == NULL) {
                DEBUG(1, (__FILE__": unable to connect\n"));