From b381fba0892021f164223bae8b0951014a28735e Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 29 Jun 2010 16:13:15 +0200
Subject: s3-registry: avoid using registry_value union.

Just pull and push data as is.

Guenther
---
 source3/utils/net_registry_util.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'source3/utils/net_registry_util.c')

diff --git a/source3/utils/net_registry_util.c b/source3/utils/net_registry_util.c
index a3b84a344f..7cbf238aeb 100644
--- a/source3/utils/net_registry_util.c
+++ b/source3/utils/net_registry_util.c
@@ -41,30 +41,46 @@ void print_registry_value(const struct registry_value *valvalue, bool raw)
 			 str_regtype(valvalue->type));
 	}
 	switch(valvalue->type) {
-	case REG_DWORD:
+	case REG_DWORD: {
+		uint32_t v = 0;
+		if (valvalue->data.length >= 4) {
+			v = IVAL(valvalue->data.data, 0);
+		}
 		if (!raw) {
 			d_printf(_("Value      = "));
 		}
-		d_printf("%d\n", valvalue->v.dword);
+		d_printf("%d\n", v);
 		break;
+	}
 	case REG_SZ:
-	case REG_EXPAND_SZ:
+	case REG_EXPAND_SZ: {
+		const char *s;
+
+		if (!pull_reg_sz(talloc_tos(), &valvalue->data, &s)) {
+			break;
+		}
 		if (!raw) {
 			d_printf(_("Value      = \""));
 		}
-		d_printf("%s", valvalue->v.sz.str);
+		d_printf("%s", s);
 		if (!raw) {
 			d_printf("\"");
 		}
 		d_printf("\n");
 		break;
+	}
 	case REG_MULTI_SZ: {
 		uint32 j;
-		for (j = 0; j < valvalue->v.multi_sz.num_strings; j++) {
+		const char **a;
+
+		if (!pull_reg_multi_sz(talloc_tos(), &valvalue->data, &a)) {
+			break;
+		}
+		for (j = 0; a[j] != NULL; j++) {
 			if (!raw) {
 				d_printf(_("Value[%3.3d] = \""), j);
 			}
-			d_printf("%s", valvalue->v.multi_sz.strings[j]);
+			d_printf("%s", a[j]);
 			if (!raw) {
 				d_printf("\"");
 			}
@@ -76,7 +92,7 @@ void print_registry_value(const struct registry_value *valvalue, bool raw)
 		if (!raw) {
 			d_printf(_("Value      = "));
 		}
-		d_printf(_("%d bytes\n"), (int)valvalue->v.binary.length);
+		d_printf(_("%d bytes\n"), (int)valvalue->data.length);
 		break;
 	default:
 		if (!raw) {
-- 
cgit