s3:registry: remove usage of reg_objects from libads/ldap_printer.c

Signed-off-by: Andreas Schneider <asn@samba.org>

1 files changed, 56 insertions, 89 deletions

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 8ff9f9bdc9..e9eb41967f 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -22,7 +22,8 @@
 #include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"
-#include "registry/reg_objects.h"
+#include "registry.h"
+#include "libcli/registry/util_reg.h"
 
 #ifdef HAVE_ADS
 
@@ -114,46 +115,45 @@ ADS_STATUS ads_add_printer_entry(ADS_STRUCT *ads, char *prt_dn,
 /*
   map a REG_SZ to an ldap mod
 */
-static bool map_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods, 
-		   struct regval_blob *value)
+static bool map_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
+		   const char *name, struct registry_value *value)
 {
-	char *str_value = NULL;
-	size_t converted_size;
+	const char *str_value = NULL;
 	ADS_STATUS status;
 
-	if (regval_type(value) != REG_SZ)
+	if (value->type != REG_SZ)
 		return false;
 
-	if (regval_size(value) && *((smb_ucs2_t *) regval_data_p(value))) {
-		if (!pull_ucs2_talloc(ctx, &str_value,
-				      (const smb_ucs2_t *) regval_data_p(value),
-				      &converted_size))
-		{
+	if (value->data.length  && value->data.data) {
+		if (!pull_reg_sz(ctx, &value->data, &str_value)) {
 			return false;
 		}
-		status = ads_mod_str(ctx, mods, regval_name(value), str_value);
+		status = ads_mod_str(ctx, mods, name, str_value);
 		return ADS_ERR_OK(status);
 	}
 	return true;
-		
 }
 
 /*
   map a REG_DWORD to an ldap mod
 */
-static bool map_dword(TALLOC_CTX *ctx, ADS_MODLIST *mods, 
-		      struct regval_blob *value)
+static bool map_dword(TALLOC_CTX *ctx, ADS_MODLIST *mods,
+		      const char *name, struct registry_value *value)
 {
 	char *str_value = NULL;
 	ADS_STATUS status;
 
-	if (regval_type(value) != REG_DWORD)
-		return False;
-	str_value = talloc_asprintf(ctx, "%d", *((uint32 *) regval_data_p(value)));
+	if (value->type != REG_DWORD) {
+		return false;
+	}
+	if (value->data.length != sizeof(uint32)) {
+		return false;
+	}
+	str_value = talloc_asprintf(ctx, "%d", IVAL(value->data.data, 0));
 	if (!str_value) {
-		return False;
+		return false;
 	}
-	status = ads_mod_str(ctx, mods, regval_name(value), str_value);
+	status = ads_mod_str(ctx, mods, name, str_value);
 	return ADS_ERR_OK(status);
 }
 
@@ -161,19 +161,21 @@ static bool map_dword(TALLOC_CTX *ctx, ADS_MODLIST *mods,
   map a boolean REG_BINARY to an ldap mod
 */
 static bool map_bool(TALLOC_CTX *ctx, ADS_MODLIST *mods,
-		     struct regval_blob *value)
+		     const char *name, struct registry_value *value)
 {
-	char *str_value;
+	const char *str_value;
 	ADS_STATUS status;
 
-	if ((regval_type(value) != REG_BINARY) || (regval_size(value) != 1))
-		return False;
-	str_value =  talloc_asprintf(ctx, "%s", 
-				     *(regval_data_p(value)) ? "TRUE" : "FALSE");
-	if (!str_value) {
-		return False;
+	if (value->type != REG_BINARY) {
+		return false;
+	}
+	if (value->data.length != 1) {
+		return false;
 	}
-	status = ads_mod_str(ctx, mods, regval_name(value), str_value);
+
+	str_value =  *value->data.data ? "TRUE" : "FALSE";
+
+	status = ads_mod_str(ctx, mods, name, str_value);
 	return ADS_ERR_OK(status);
 }
 
@@ -181,55 +183,35 @@ static bool map_bool(TALLOC_CTX *ctx, ADS_MODLIST *mods,
   map a REG_MULTI_SZ to an ldap mod
 */
 static bool map_multi_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
-			 struct regval_blob *value)
+			 const char *name, struct registry_value *value)
 {
-	char **str_values = NULL;
-	size_t converted_size;
-	smb_ucs2_t *cur_str = (smb_ucs2_t *) regval_data_p(value);
-        uint32 size = 0, num_vals = 0, i=0;
+	const char **str_values = NULL;
 	ADS_STATUS status;
 
-	if (regval_type(value) != REG_MULTI_SZ)
-		return False;
-
-	while(cur_str && *cur_str && (size < regval_size(value))) {
-		size += 2 * (strlen_w(cur_str) + 1);
-		cur_str += strlen_w(cur_str) + 1;
-		num_vals++;
-	};
+	if (value->type != REG_MULTI_SZ) {
+		return false;
+	}
 
-	if (num_vals) {
-		str_values = talloc_array(ctx, char *, num_vals + 1);
-		if (!str_values) {
-			return False;
-		}
-		memset(str_values, '\0', 
-		       (num_vals + 1) * sizeof(char *));
-
-		cur_str = (smb_ucs2_t *) regval_data_p(value);
-		for (i=0; i < num_vals; i++) {
-			cur_str += pull_ucs2_talloc(ctx, &str_values[i],
-						    cur_str, &converted_size) ?
-			    converted_size : (size_t)-1;
+	if (value->data.length  && value->data.data) {
+		if (!pull_reg_multi_sz(ctx, &value->data, &str_values)) {
+			return false;
 		}
-
-		status = ads_mod_strlist(ctx, mods, regval_name(value),
-					 (const char **) str_values);
+		status = ads_mod_strlist(ctx, mods, name, str_values);
 		return ADS_ERR_OK(status);
-	} 
-	return True;
+	}
+	return true;
 }
 
 struct valmap_to_ads {
 	const char *valname;
-	bool (*fn)(TALLOC_CTX *, ADS_MODLIST *, struct regval_blob *);
+	bool (*fn)(TALLOC_CTX *, ADS_MODLIST *, const char *, struct registry_value *);
 };
 
 /*
   map a REG_SZ to an ldap mod
 */
 static void map_regval_to_ads(TALLOC_CTX *ctx, ADS_MODLIST *mods, 
-			      struct regval_blob *value)
+			      const char *name, struct registry_value *value)
 {
 	const struct valmap_to_ads map[] = {
 		{SPOOL_REG_ASSETNUMBER, map_sz},
@@ -289,13 +271,12 @@ static void map_regval_to_ads(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 	int i;
 
 	for (i=0; map[i].valname; i++) {
-		if (strcasecmp_m(map[i].valname, regval_name(value)) == 0) {
-			if (!map[i].fn(ctx, mods, value)) {
-				DEBUG(5, ("Add of value %s to modlist failed\n", regval_name(value)));
+		if (strcasecmp_m(map[i].valname, name) == 0) {
+			if (!map[i].fn(ctx, mods, name, value)) {
+				DEBUG(5, ("Add of value %s to modlist failed\n", name));
 			} else {
-				DEBUG(7, ("Mapped value %s\n", regval_name(value)));
+				DEBUG(7, ("Mapped value %s\n", name));
 			}
-			
 		}
 	}
 }
@@ -343,18 +324,11 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
 	} else {
 		/* Have the data we need now, so start building */
 		for (i=0; i < count; i++) {
-			struct regval_blob *v;
-
-			v = regval_compose(mem_ctx, info[i].value_name,
-					   info[i].type,
-					   info[i].data->data,
-					   info[i].data->length);
-			if (v == NULL) {
-				return WERR_NOMEM;
-			}
+			struct registry_value v;
+			v.type = info[i].type;
+			v.data = *info[i].data;
 
-			map_regval_to_ads(mem_ctx, mods, v);
-			talloc_free(v);
+			map_regval_to_ads(mem_ctx, mods, info[i].value_name, &v);
 		}
 	}
 
@@ -368,18 +342,11 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
 			  printername, win_errstr(result)));
 	} else {
 		for (i=0; i < count; i++) {
-			struct regval_blob *v;
-
-			v = regval_compose(mem_ctx, info[i].value_name,
-					   info[i].type,
-					   info[i].data->data,
-					   info[i].data->length);
-			if (v == NULL) {
-				return WERR_NOMEM;
-			}
+			struct registry_value v;
+			v.type = info[i].type;
+			v.data = *info[i].data;
 
-			map_regval_to_ads(mem_ctx, mods, v);
-			talloc_free(v);
+			map_regval_to_ads(mem_ctx, mods, info[i].value_name, &v);
 		}
 	}