Attachment 3152 Details for Bug 5178 – Here the patch

[patch] Here the patch

reg.patch (text/plain), 1.50 KB, created by Matthias Dieter Wallnöfer on 2008-02-27 07:47:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Dieter Wallnöfer

Created: 2008-02-27 07:47:09 UTC

Size: 1.50 KB

patch

obsolete

>diff --git a/source/lib/registry/ldb.c b/source/lib/registry/ldb.c
>index 0c8a553..57c597d 100644
>--- a/source/lib/registry/ldb.c
>+++ b/source/lib/registry/ldb.c
>@@ -62,6 +62,11 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, struct ldb_message *msg,
> 						     (void **)&data->data);
> 		break;
> 
>+	case REG_BINARY:
>+		*data = strhex_to_data_blob(val->data);
>+		talloc_steal(mem_ctx,data->data);
>+		break;
>+
> 	case REG_DWORD: {
> 		uint32_t tmp = strtoul((char *)val->data, NULL, 0);
> 		*data = data_blob_talloc(mem_ctx, &tmp, 4);
>@@ -88,18 +93,30 @@ static struct ldb_message *reg_ldb_pack_value(struct ldb_context *ctx,
> 	switch (type) {
> 	case REG_SZ:
> 	case REG_EXPAND_SZ:
>-		val.length = convert_string_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX,
>+		if (*(data.data)) {
>+			val.length = convert_string_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX,
> 						   (void *)data.data,
> 						   data.length,
> 						   (void **)&val.data);
>+		} else {
>+			/* workaround for empty REG_SZ values */
>+			val.data = (uint8_t *) talloc_asprintf(mem_ctx," ");
>+			val.length = strlen(val.data);
>+		}
> 		ldb_msg_add_value(msg, "data", &val, NULL);
> 		break;
> 
>+	case REG_BINARY:	
>+		ldb_msg_add_string(msg, "data",
>+				   data_blob_hex_string(mem_ctx,&data));
>+		break;
>+
> 	case REG_DWORD:
> 		ldb_msg_add_string(msg, "data",
> 				   talloc_asprintf(mem_ctx, "0x%x",
> 				   		   IVAL(data.data, 0)));
> 		break;
>+
> 	default:
> 		ldb_msg_add_value(msg, "data", &data, NULL);
> 	}

Actions: View

Attachments on bug 5178: 3090 | 3108 | 3109 | 3110 | 3111 | 3112 | 3113 | 3152 | 3400 | 3464 | 3466 | 3472 | 3473 | 3474 | 3480 | 3481 | 3497 | 3572