r2518: Some long overdue changes:

 - Samba4-style code in lib/registry (struct registry_key instead of REG_KEY, etc)
 - Use hives (like Windows has drives) instead of one root key (like a Unix FS)
 - usability fixes in the GTK utilities (autodetect the username,
	enable/disable options, etc)
 - fix gwsam compile
 - several bugfixes in the registry rpc code
 - do charset conversion in nt4 registry backend
(This used to be commit 2762ed3b9bf1d67dd54d63e02cddbfd71ea89892)

1 files changed, 21 insertions, 43 deletions

diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index db5e97bf7f..21c925deab 100644
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -34,90 +34,68 @@ const char *str_regtype(int type)
 	return "Unknown";
 }
 
-char *reg_val_data_string(REG_VAL *v)
+char *reg_val_data_string(TALLOC_CTX *mem_ctx, struct registry_value *v)
 { 
   char *asciip;
   char *ret = NULL;
   int i;
 
-  if(reg_val_size(v) == 0) return strdup("");
+  if(v->data_len == 0) return talloc_strdup(mem_ctx, "");
 
-  switch (reg_val_type(v)) {
+  switch (v->data_type) {
   case REG_SZ:
-	  /* FIXME: Convert to ascii */
-	  return strndup(reg_val_data_blk(v), reg_val_size(v));
+	  return talloc_strndup(mem_ctx, v->data_blk, v->data_len);
 
   case REG_EXPAND_SZ:
-	  return strndup(reg_val_data_blk(v), reg_val_size(v));
+	  return talloc_strndup(mem_ctx, v->data_blk, v->data_len);
 
   case REG_BINARY:
-	  ret = malloc(reg_val_size(v) * 3 + 2);
+	  ret = talloc(mem_ctx, v->data_len * 3 + 2);
 	  asciip = ret;
-	  for (i=0; i<reg_val_size(v); i++) { 
-		  int str_rem = reg_val_size(v) * 3 - (asciip - ret);
-		  asciip += snprintf(asciip, str_rem, "%02x", *(uint8_t *)(reg_val_data_blk(v)+i));
-		  if (i < reg_val_size(v) && str_rem > 0)
+	  for (i=0; i<v->data_len; i++) { 
+		  int str_rem = v->data_len * 3 - (asciip - ret);
+		  asciip += snprintf(asciip, str_rem, "%02x", *(uint8_t *)(v->data_blk+i));
+		  if (i < v->data_len && str_rem > 0)
 			  *asciip = ' '; asciip++;	
 	  }
 	  *asciip = '\0';
 	  return ret;
-	  break;
 
   case REG_DWORD:
-	  if (*(int *)reg_val_data_blk(v) == 0)
-		  ret = strdup("0");
-	  else
-		  asprintf(&ret, "0x%x", *(int *)reg_val_data_blk(v));
-	  break;
+	  if (*(int *)v->data_blk == 0)
+		  return talloc_strdup(mem_ctx, "0");
+
+	  return talloc_asprintf(mem_ctx, "0x%x", *(int *)v->data_blk);
 
   case REG_MULTI_SZ:
 	/* FIXME */
     break;
 
   default:
-    return 0;
     break;
   } 
 
   return ret;
 }
 
-char *reg_val_description(REG_VAL *val) 
+char *reg_val_description(TALLOC_CTX *mem_ctx, struct registry_value *val) 
 {
-	char *ret, *ds = reg_val_data_string(val);
-	asprintf(&ret, "%s = %s : %s", reg_val_name(val)?reg_val_name(val):"<No Name>", str_regtype(reg_val_type(val)), ds);
-	free(ds);
-	return ret;
+	return talloc_asprintf(mem_ctx, "%s = %s : %s", val->name?val->name:"<No Name>", str_regtype(val->data_type), reg_val_data_string(mem_ctx, val));
 }
 
-BOOL reg_val_set_string(REG_VAL *val, char *str)
+BOOL reg_val_set_string(struct registry_value *val, char *str)
 {
 	/* FIXME */
 	return False;
 }
 
-WERROR reg_key_get_subkey_val(REG_KEY *key, const char *subname, const char *valname, REG_VAL **val)
+WERROR reg_key_get_subkey_val(TALLOC_CTX *mem_ctx, struct registry_key *key, const char *subname, const char *valname, struct registry_value **val)
 {
-	REG_KEY *k;
-	WERROR error = reg_key_get_subkey_by_name(key, subname, &k);
-	if(!W_ERROR_IS_OK(error)) return error;
-	
-	return reg_key_get_value_by_name(k, valname, val);
-}
-
-WERROR reg_key_set_subkey_val(REG_KEY *key, const char *subname, const char *valname, uint32_t type, uint8_t *data, int real_len)
-{
-	REG_KEY *k;
-	REG_VAL *v;
-	WERROR error;
-
-	error = reg_key_get_subkey_by_name(key, subname, &k);
-	if(!W_ERROR_IS_OK(error)) return error;
-
-	error = reg_key_get_value_by_name(k, valname, &v);
+	struct registry_key *k;
+	WERROR error = reg_key_get_subkey_by_name(mem_ctx, key, subname, &k);
 	if(!W_ERROR_IS_OK(error)) return error;
 	
-	return reg_val_update(v, type, data, real_len);
+	return reg_key_get_value_by_name(mem_ctx, k, valname, val);
 }
 
 /***********************************************************************