s3:registry: fix regval_ctr_addvalue() to take data as uint8 *, not char *.
[amitay/samba.git] / source3 / registry / reg_objects.c
index 9cfeb7faa97baf29b61c973a2af613295262e246..52f2b6bbf1a18063d2af56f828f9cbcf7b778dcb 100644 (file)
-/* 
+/*
  *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Gerald Carter                     2002.
+ *  Virtual Windows Registry Layer
+ *  Copyright (C) Gerald Carter                     2002-2005
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Implementation of registry frontend view functions. */
 
 #include "includes.h"
+#include "registry.h"
 
 #undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_SRV
+#define DBGC_CLASS DBGC_REGISTRY
 
+struct regsubkey_ctr {
+       uint32_t        num_subkeys;
+       char            **subkeys;
+       struct db_context *subkeys_hash;
+       int seqnum;
+};
+
+/**********************************************************************
+
+ Note that the struct regsubkey_ctr and struct regval_ctr objects *must* be
+ talloc()'d since the methods use the object pointer as the talloc
+ context for internal private data.
+
+ There is no longer a regval_ctr_intit() and regval_ctr_destroy()
+ pair of functions.  Simply TALLOC_ZERO_P() and TALLOC_FREE() the
+ object.
 
-/***********************************************************************
- Init the talloc context held by a REGSUBKEY_CTR structure
  **********************************************************************/
 
-void regsubkey_ctr_init( REGSUBKEY_CTR *ctr )
+WERROR regsubkey_ctr_init(TALLOC_CTX *mem_ctx, struct regsubkey_ctr **ctr)
 {
-       if ( !ctr->ctx )
-               ctr->ctx = talloc_init("regsubkey_ctr_init for ctr %p", ctr);
+       if (ctr == NULL) {
+               return WERR_INVALID_PARAM;
+       }
+
+       *ctr = talloc_zero(mem_ctx, struct regsubkey_ctr);
+       if (*ctr == NULL) {
+               return WERR_NOMEM;
+       }
+
+       (*ctr)->subkeys_hash = db_open_rbt(*ctr);
+       if ((*ctr)->subkeys_hash == NULL) {
+               talloc_free(*ctr);
+               return WERR_NOMEM;
+       }
+
+       return WERR_OK;
 }
 
-/***********************************************************************
- Add a new key to the array
- **********************************************************************/
+/**
+ * re-initialize the list of subkeys (to the emtpy list)
+ * in an already allocated regsubkey_ctr
+ */
 
-int regsubkey_ctr_addkey( REGSUBKEY_CTR *ctr, const char *keyname )
+WERROR regsubkey_ctr_reinit(struct regsubkey_ctr *ctr)
 {
-       uint32 len;
-       char **pp;
-       
-       if ( keyname )
-       {
-               len = strlen( keyname );
-
-               /* allocate a space for the char* in the array */
-               
-               if (  ctr->subkeys == 0 )
-                       ctr->subkeys = talloc( ctr->ctx, sizeof(char*) );
-               else {
-                       pp = talloc_realloc( ctr->ctx, ctr->subkeys, sizeof(char*)*(ctr->num_subkeys+1) );
-                       if ( pp )
-                               ctr->subkeys = pp;
-               }
+       if (ctr == NULL) {
+               return WERR_INVALID_PARAM;
+       }
+
+       talloc_free(ctr->subkeys_hash);
+       ctr->subkeys_hash = db_open_rbt(ctr);
+       W_ERROR_HAVE_NO_MEMORY(ctr->subkeys_hash);
+
+       TALLOC_FREE(ctr->subkeys);
+
+       ctr->num_subkeys = 0;
+       ctr->seqnum = 0;
 
-               /* allocate the string and save it in the array */
-               
-               ctr->subkeys[ctr->num_subkeys] = talloc( ctr->ctx, len+1 );
-               strncpy( ctr->subkeys[ctr->num_subkeys], keyname, len+1 );
-               ctr->num_subkeys++;
+       return WERR_OK;
+}
+
+WERROR regsubkey_ctr_set_seqnum(struct regsubkey_ctr *ctr, int seqnum)
+{
+       if (ctr == NULL) {
+               return WERR_INVALID_PARAM;
        }
-       
-       return ctr->num_subkeys;
+
+       ctr->seqnum = seqnum;
+
+       return WERR_OK;
+}
+
+int regsubkey_ctr_get_seqnum(struct regsubkey_ctr *ctr)
+{
+       if (ctr == NULL) {
+               return -1;
+       }
+
+       return ctr->seqnum;
+}
+
+static WERROR regsubkey_ctr_hash_keyname(struct regsubkey_ctr *ctr,
+                                        const char *keyname,
+                                        uint32 idx)
+{
+       WERROR werr;
+
+       werr = ntstatus_to_werror(dbwrap_store_bystring_upper(ctr->subkeys_hash,
+                                               keyname,
+                                               make_tdb_data((uint8 *)&idx,
+                                                             sizeof(idx)),
+                                               TDB_REPLACE));
+       if (!W_ERROR_IS_OK(werr)) {
+               DEBUG(1, ("error hashing new key '%s' in container: %s\n",
+                         keyname, win_errstr(werr)));
+       }
+
+       return werr;
+}
+
+static WERROR regsubkey_ctr_unhash_keyname(struct regsubkey_ctr *ctr,
+                                          const char *keyname)
+{
+       WERROR werr;
+
+       werr = ntstatus_to_werror(dbwrap_delete_bystring_upper(ctr->subkeys_hash,
+                                 keyname));
+       if (!W_ERROR_IS_OK(werr)) {
+               DEBUG(1, ("error unhashing key '%s' in container: %s\n",
+                         keyname, win_errstr(werr)));
+       }
+
+       return werr;
+}
+
+static WERROR regsubkey_ctr_index_for_keyname(struct regsubkey_ctr *ctr,
+                                             const char *keyname,
+                                             uint32 *idx)
+{
+       TDB_DATA data;
+
+       if ((ctr == NULL) || (keyname == NULL)) {
+               return WERR_INVALID_PARAM;
+       }
+
+       data = dbwrap_fetch_bystring_upper(ctr->subkeys_hash, ctr, keyname);
+       if (data.dptr == NULL) {
+               return WERR_NOT_FOUND;
+       }
+
+       if (data.dsize != sizeof(*idx)) {
+               talloc_free(data.dptr);
+               return WERR_INVALID_DATATYPE;
+       }
+
+       if (idx != NULL) {
+               *idx = *(uint32 *)data.dptr;
+       }
+
+       talloc_free(data.dptr);
+       return WERR_OK;
 }
+
 /***********************************************************************
- How many keys does the container hold ?
+ Add a new key to the array
  **********************************************************************/
 
-int regsubkey_ctr_numkeys( REGSUBKEY_CTR *ctr )
+WERROR regsubkey_ctr_addkey( struct regsubkey_ctr *ctr, const char *keyname )
 {
-       return ctr->num_subkeys;
+       char **newkeys;
+       WERROR werr;
+
+       if ( !keyname ) {
+               return WERR_OK;
+       }
+
+       /* make sure the keyname is not already there */
+
+       if ( regsubkey_ctr_key_exists( ctr, keyname ) ) {
+               return WERR_OK;
+       }
+
+       if (!(newkeys = TALLOC_REALLOC_ARRAY(ctr, ctr->subkeys, char *,
+                                            ctr->num_subkeys+1))) {
+               return WERR_NOMEM;
+       }
+
+       ctr->subkeys = newkeys;
+
+       if (!(ctr->subkeys[ctr->num_subkeys] = talloc_strdup(ctr->subkeys,
+                                                            keyname ))) {
+               /*
+                * Don't shrink the new array again, this wastes a pointer
+                */
+               return WERR_NOMEM;
+       }
+
+       werr = regsubkey_ctr_hash_keyname(ctr, keyname, ctr->num_subkeys);
+       W_ERROR_NOT_OK_RETURN(werr);
+
+       ctr->num_subkeys++;
+
+       return WERR_OK;
 }
 
-/***********************************************************************
- Retreive a specific key string
+ /***********************************************************************
+ Delete a key from the array
  **********************************************************************/
 
-char* regsubkey_ctr_specific_key( REGSUBKEY_CTR *ctr, uint32 key_index )
+WERROR regsubkey_ctr_delkey( struct regsubkey_ctr *ctr, const char *keyname )
 {
-       if ( ! (key_index < ctr->num_subkeys) )
-               return NULL;
-               
-       return ctr->subkeys[key_index];
+       WERROR werr;
+       uint32 idx, j;
+
+       if (keyname == NULL) {
+               return WERR_INVALID_PARAM;
+       }
+
+       /* make sure the keyname is actually already there */
+
+       werr = regsubkey_ctr_index_for_keyname(ctr, keyname, &idx);
+       W_ERROR_NOT_OK_RETURN(werr);
+
+       werr = regsubkey_ctr_unhash_keyname(ctr, keyname);
+       W_ERROR_NOT_OK_RETURN(werr);
+
+       /* update if we have any keys left */
+       ctr->num_subkeys--;
+       if (idx < ctr->num_subkeys) {
+               memmove(&ctr->subkeys[idx], &ctr->subkeys[idx+1],
+                       sizeof(char *) * (ctr->num_subkeys - idx));
+
+               /* we have to re-hash rest of the array...  :-( */
+               for (j = idx; j < ctr->num_subkeys; j++) {
+                       werr = regsubkey_ctr_hash_keyname(ctr, ctr->subkeys[j], j);
+                       W_ERROR_NOT_OK_RETURN(werr);
+               }
+       }
+
+       return WERR_OK;
 }
 
 /***********************************************************************
- free memory held by a REGSUBKEY_CTR structure
+ Check for the existance of a key
  **********************************************************************/
 
-void regsubkey_ctr_destroy( REGSUBKEY_CTR *ctr )
+bool regsubkey_ctr_key_exists( struct regsubkey_ctr *ctr, const char *keyname )
 {
-       if ( ctr ) {
-               talloc_destroy( ctr->ctx );     
-               ZERO_STRUCTP( ctr );
+       WERROR werr;
+
+       if (!ctr->subkeys) {
+               return False;
+       }
+
+       werr = regsubkey_ctr_index_for_keyname(ctr, keyname, NULL);
+       if (!W_ERROR_IS_OK(werr)) {
+               return false;
        }
+
+       return true;
 }
 
+/***********************************************************************
+ How many keys does the container hold ?
+ **********************************************************************/
 
-/*
- * Utility functions for REGVAL_CTR
- */
+int regsubkey_ctr_numkeys( struct regsubkey_ctr *ctr )
+{
+       return ctr->num_subkeys;
+}
 
 /***********************************************************************
- Init the talloc context held by a REGSUBKEY_CTR structure
+ Retreive a specific key string
  **********************************************************************/
 
-void regval_ctr_init( REGVAL_CTR *ctr )
+char* regsubkey_ctr_specific_key( struct regsubkey_ctr *ctr, uint32_t key_index )
 {
-       if ( !ctr->ctx )
-               ctr->ctx = talloc_init("regval_ctr_init for ctr %p", ctr);
+       if ( ! (key_index < ctr->num_subkeys) )
+               return NULL;
+
+       return ctr->subkeys[key_index];
 }
 
+/*
+ * Utility functions for struct regval_ctr
+ */
+
 /***********************************************************************
  How many keys does the container hold ?
  **********************************************************************/
 
-int regval_ctr_numvals( REGVAL_CTR *ctr )
+int regval_ctr_numvals(struct regval_ctr *ctr)
 {
        return ctr->num_values;
 }
 
 /***********************************************************************
- allocate memory for and duplicate a REGISTRY_VALUE.
+ allocate memory for and duplicate a struct regval_blob.
  This is malloc'd memory so the caller should free it when done
  **********************************************************************/
 
-REGISTRY_VALUE* dup_registry_value( REGISTRY_VALUE *val )
+struct regval_blob* dup_registry_value(struct regval_blob *val)
 {
-       REGISTRY_VALUE  *copy = NULL;
-       
+       struct regval_blob *copy = NULL;
+
        if ( !val )
                return NULL;
-       
-       if ( !(copy = malloc( sizeof(REGISTRY_VALUE) )) ) {
+
+       if ( !(copy = SMB_MALLOC_P( struct regval_blob)) ) {
                DEBUG(0,("dup_registry_value: malloc() failed!\n"));
                return NULL;
        }
-       
+
        /* copy all the non-pointer initial data */
-       
-       memcpy( copy, val, sizeof(REGISTRY_VALUE) );
-       if ( val->data_p ) 
+
+       memcpy( copy, val, sizeof(struct regval_blob) );
+
+       copy->size = 0;
+       copy->data_p = NULL;
+
+       if ( val->data_p && val->size )
        {
-               if ( !(copy->data_p = memdup( val->data_p, val->size )) ) {
-                       DEBUG(0,("dup_registry_value: memdup() failed for [%d] bytes!\n",
-                               val->size));
+               if ( !(copy->data_p = (uint8 *)memdup( val->data_p,
+                                                      val->size )) ) {
+                       DEBUG(0,("dup_registry_value: memdup() failed for [%d] "
+                                "bytes!\n", val->size));
                        SAFE_FREE( copy );
+                       return NULL;
                }
+               copy->size = val->size;
        }
-       
-       return copy;    
+
+       return copy;
 }
 
 /**********************************************************************
- free the memory allocated to a REGISTRY_VALUE 
+ free the memory allocated to a struct regval_blob
  *********************************************************************/
-void free_registry_value( REGISTRY_VALUE *val )
+
+void free_registry_value(struct regval_blob *val)
 {
        if ( !val )
                return;
-               
+
        SAFE_FREE( val->data_p );
        SAFE_FREE( val );
-       
+
        return;
 }
 
 /**********************************************************************
  *********************************************************************/
 
-uint8* regval_data_p( REGISTRY_VALUE *val )
+uint8* regval_data_p(struct regval_blob *val)
 {
        return val->data_p;
 }
@@ -184,7 +367,7 @@ uint8* regval_data_p( REGISTRY_VALUE *val )
 /**********************************************************************
  *********************************************************************/
 
-int regval_size( REGISTRY_VALUE *val )
+uint32 regval_size(struct regval_blob *val)
 {
        return val->size;
 }
@@ -192,7 +375,7 @@ int regval_size( REGISTRY_VALUE *val )
 /**********************************************************************
  *********************************************************************/
 
-char* regval_name( REGISTRY_VALUE *val )
+char* regval_name(struct regval_blob *val)
 {
        return val->valuename;
 }
@@ -200,104 +383,156 @@ char* regval_name( REGISTRY_VALUE *val )
 /**********************************************************************
  *********************************************************************/
 
-uint32 regval_type( REGISTRY_VALUE *val )
+uint32 regval_type(struct regval_blob *val)
 {
        return val->type;
 }
 
 /***********************************************************************
  Retreive a pointer to a specific value.  Caller shoud dup the structure
- since this memory may go away with a regval_ctr_destroy()
+ since this memory will go away when the ctr is free()'d
  **********************************************************************/
 
-REGISTRY_VALUE* regval_ctr_specific_value( REGVAL_CTR *ctr, uint32 idx )
+struct regval_blob *regval_ctr_specific_value(struct regval_ctr *ctr,
+                                             uint32 idx)
 {
        if ( !(idx < ctr->num_values) )
                return NULL;
-               
+
        return ctr->values[idx];
 }
 
 /***********************************************************************
- Retrive the TALLOC_CTX associated with a REGISTRY_VALUE 
+ Check for the existance of a value
  **********************************************************************/
 
-TALLOC_CTX* regval_ctr_getctx( REGVAL_CTR *val )
+bool regval_ctr_key_exists(struct regval_ctr *ctr, const char *value)
 {
-       if ( !val )
+       int     i;
+
+       for ( i=0; i<ctr->num_values; i++ ) {
+               if ( strequal( ctr->values[i]->valuename, value) )
+                       return True;
+       }
+
+       return False;
+}
+
+/***********************************************************************
+ * compose a struct regval_blob from input data
+ **********************************************************************/
+
+struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
+                                  uint16 type,
+                                  const uint8 *data_p, size_t size)
+{
+       struct regval_blob *regval = TALLOC_P(ctx, struct regval_blob);
+
+       if (regval == NULL) {
                return NULL;
+       }
+
+       fstrcpy(regval->valuename, name);
+       regval->type = type;
+       if (size) {
+               regval->data_p = (uint8 *)TALLOC_MEMDUP(regval, data_p, size);
+               if (!regval->data_p) {
+                       TALLOC_FREE(regval);
+                       return NULL;
+               }
+       } else {
+               regval->data_p = NULL;
+       }
+       regval->size = size;
 
-       return val->ctx;
+       return regval;
 }
 
 /***********************************************************************
  Add a new registry value to the array
  **********************************************************************/
 
-int regval_ctr_addvalue( REGVAL_CTR *ctr, const char *name, uint16 type, 
-                         const char *data_p, size_t size )
+int regval_ctr_addvalue(struct regval_ctr *ctr, const char *name, uint16 type,
+                        const uint8 *data_p, size_t size)
 {
-       REGISTRY_VALUE **ppreg;
-       
-       if ( name )
-       {
-               /* allocate a slot in the array of pointers */
-               
-               if (  ctr->num_values == 0 )
-                       ctr->values = talloc( ctr->ctx, sizeof(REGISTRY_VALUE*) );
-               else {
-                       ppreg = talloc_realloc( ctr->ctx, ctr->values, sizeof(REGISTRY_VALUE*)*(ctr->num_values+1) );
-                       if ( ppreg )
-                               ctr->values = ppreg;
-               }
+       if ( !name )
+               return ctr->num_values;
 
-               /* allocate a new value and store the pointer in the arrya */
-               
-               ctr->values[ctr->num_values] = talloc( ctr->ctx, sizeof(REGISTRY_VALUE) );
+       /* Delete the current value (if it exists) and add the new one */
 
-               /* init the value */
-       
-               fstrcpy( ctr->values[ctr->num_values]->valuename, name );
-               ctr->values[ctr->num_values]->type = type;
-               ctr->values[ctr->num_values]->data_p = talloc_memdup( ctr->ctx, data_p, size );
-               ctr->values[ctr->num_values]->size = size;
-               ctr->num_values++;
+       regval_ctr_delvalue( ctr, name );
+
+       /* allocate a slot in the array of pointers */
+
+       if (  ctr->num_values == 0 ) {
+               ctr->values = TALLOC_P( ctr, struct regval_blob *);
+       } else {
+               ctr->values = TALLOC_REALLOC_ARRAY(ctr, ctr->values,
+                                                  struct regval_blob *,
+                                                  ctr->num_values+1);
        }
 
+       if (!ctr->values) {
+               ctr->num_values = 0;
+               return 0;
+       }
+
+       /* allocate a new value and store the pointer in the arrya */
+
+       ctr->values[ctr->num_values] = regval_compose(ctr, name, type, data_p,
+                                                     size);
+       if (ctr->values[ctr->num_values] == NULL) {
+               ctr->num_values = 0;
+               return 0;
+       }
+       ctr->num_values++;
+
        return ctr->num_values;
 }
 
 /***********************************************************************
- Add a new registry value to the array
+ Add a new registry SZ value to the array
  **********************************************************************/
 
-int regval_ctr_copyvalue( REGVAL_CTR *ctr, REGISTRY_VALUE *val )
+int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char *data)
 {
-       REGISTRY_VALUE **ppreg;
-       
-       if ( val )
-       {
-               /* allocate a slot in the array of pointers */
-               
-               if (  ctr->num_values == 0 )
-                       ctr->values = talloc( ctr->ctx, sizeof(REGISTRY_VALUE*) );
-               else {
-                       ppreg = talloc_realloc( ctr->ctx, ctr->values, sizeof(REGISTRY_VALUE*)*(ctr->num_values+1) );
-                       if ( ppreg )
-                               ctr->values = ppreg;
-               }
+       DATA_BLOB blob;
+
+       if (!push_reg_sz(ctr, &blob, data)) {
+               return -1;
+       }
+
+       return regval_ctr_addvalue(ctr, name, REG_SZ,
+                                  (const uint8 *)blob.data,
+                                  blob.length);
+}
+
+/***********************************************************************
+ Add a new registry MULTI_SZ value to the array
+ **********************************************************************/
 
-               /* allocate a new value and store the pointer in the arrya */
-               
-               ctr->values[ctr->num_values] = talloc( ctr->ctx, sizeof(REGISTRY_VALUE) );
+int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const char **data)
+{
+       DATA_BLOB blob;
 
-               /* init the value */
-       
-               fstrcpy( ctr->values[ctr->num_values]->valuename, val->valuename );
-               ctr->values[ctr->num_values]->type = val->type;
-               ctr->values[ctr->num_values]->data_p = talloc_memdup( ctr->ctx, val->data_p, val->size );
-               ctr->values[ctr->num_values]->size = val->size;
-               ctr->num_values++;
+       if (!push_reg_multi_sz(ctr, &blob, data)) {
+               return -1;
+       }
+
+       return regval_ctr_addvalue(ctr, name, REG_MULTI_SZ,
+                                  (const uint8 *)blob.data,
+                                  blob.length);
+}
+
+/***********************************************************************
+ Add a new registry value to the array
+ **********************************************************************/
+
+int regval_ctr_copyvalue(struct regval_ctr *ctr, struct regval_blob *val)
+{
+       if ( val ) {
+               regval_ctr_addvalue(ctr, val->valuename, val->type,
+                                   (uint8 *)val->data_p, val->size);
        }
 
        return ctr->num_values;
@@ -308,67 +543,72 @@ int regval_ctr_copyvalue( REGVAL_CTR *ctr, REGISTRY_VALUE *val )
  No need to free memory since it is talloc'd.
  **********************************************************************/
 
-int regval_ctr_delvalue( REGVAL_CTR *ctr, const char *name )
+int regval_ctr_delvalue(struct regval_ctr *ctr, const char *name)
 {
        int     i;
-       
-       /* search for the value */
-       if (!(ctr->num_values))
-               return 0;
-       
+
        for ( i=0; i<ctr->num_values; i++ ) {
-               if ( strcmp( ctr->values[i]->valuename, name ) == 0)
+               if ( strequal( ctr->values[i]->valuename, name ) )
                        break;
        }
-       
+
        /* just return if we don't find it */
-       
+
        if ( i == ctr->num_values )
                return ctr->num_values;
-       
-       /* just shift everything down one */
-       
-       for ( /* use previous i */; i<(ctr->num_values-1); i++ )
-               memcpy( ctr->values[i], ctr->values[i+1], sizeof(REGISTRY_VALUE) );
-               
-       /* paranoia */
-       
-       ZERO_STRUCTP( ctr->values[i] );
-       
+
+       /* If 'i' was not the last element, just shift everything down one */
        ctr->num_values--;
-       
+       if ( i < ctr->num_values )
+               memmove(&ctr->values[i], &ctr->values[i+1],
+                       sizeof(struct regval_blob*)*(ctr->num_values-i));
+
        return ctr->num_values;
 }
 
 /***********************************************************************
Delete a single value from the registry container.
Retrieve single value from the registry container.
  No need to free memory since it is talloc'd.
  **********************************************************************/
 
-REGISTRY_VALUE* regval_ctr_getvalue( REGVAL_CTR *ctr, const char *name )
+struct regval_blob* regval_ctr_getvalue(struct regval_ctr *ctr,
+                                       const char *name)
 {
        int     i;
-       
+
        /* search for the value */
-       
+
        for ( i=0; i<ctr->num_values; i++ ) {
                if ( strequal( ctr->values[i]->valuename, name ) )
                        return ctr->values[i];
        }
-       
+
        return NULL;
 }
 
 /***********************************************************************
- free memory held by a REGVAL_CTR structure
+ return the data_p as a uint32
  **********************************************************************/
 
-void regval_ctr_destroy( REGVAL_CTR *ctr )
+uint32 regval_dword(struct regval_blob *val)
 {
-       if ( ctr ) {
-               talloc_destroy( ctr->ctx );
-               ZERO_STRUCTP( ctr );
-       }
+       uint32 data;
+
+       data = IVAL( regval_data_p(val), 0 );
+
+       return data;
 }
 
+/***********************************************************************
+ return the data_p as a character string
+ **********************************************************************/
+
+const char *regval_sz(struct regval_blob *val)
+{
+       const char *data = NULL;
+       DATA_BLOB blob = data_blob_const(regval_data_p(val), regval_size(val));
 
+       pull_reg_sz(talloc_tos(), &blob, &data);
+
+       return data;
+}