s3-registry: avoid using registry_value union.
[nivanova/samba-autobuild/.git] / source3 / registry / reg_api.c
index e52aaacb4d50eccac738dc9aada83c7ac43d0fbb..a3fcff859aace3de509cdbc461b6c482335501e5 100644 (file)
  */
 
 #include "includes.h"
+#include "registry.h"
+#include "reg_cachehook.h"
 #include "regfio.h"
+#include "reg_util_internal.h"
+#include "reg_backend_db.h"
+#include "reg_dispatcher.h"
+#include "reg_util_marshalling.h"
+#include "reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 static WERROR fill_value_cache(struct registry_key *key)
 {
+       WERROR werr;
+
        if (key->values != NULL) {
                if (!reg_values_need_update(key->key, key->values)) {
                        return WERR_OK;
                }
        }
 
-       if (!(key->values = TALLOC_ZERO_P(key, REGVAL_CTR))) {
-               return WERR_NOMEM;
-       }
+       werr = regval_ctr_init(key, &(key->values));
+       W_ERROR_NOT_OK_RETURN(werr);
+
        if (fetch_reg_values(key->key, key->values) == -1) {
                TALLOC_FREE(key->values);
                return WERR_BADFILE;
@@ -94,15 +104,16 @@ static WERROR fill_value_cache(struct registry_key *key)
 
 static WERROR fill_subkey_cache(struct registry_key *key)
 {
+       WERROR werr;
+
        if (key->subkeys != NULL) {
                if (!reg_subkeys_need_update(key->key, key->subkeys)) {
                        return WERR_OK;
                }
        }
 
-       if (!(key->subkeys = TALLOC_ZERO_P(key, REGSUBKEY_CTR))) {
-               return WERR_NOMEM;
-       }
+       werr = regsubkey_ctr_init(key, &(key->subkeys));
+       W_ERROR_NOT_OK_RETURN(werr);
 
        if (fetch_reg_keys(key->key, key->subkeys) == -1) {
                TALLOC_FREE(key->subkeys);
@@ -112,7 +123,7 @@ static WERROR fill_subkey_cache(struct registry_key *key)
        return WERR_OK;
 }
 
-static int regkey_destructor(REGISTRY_KEY *key)
+static int regkey_destructor(struct registry_key_handle *key)
 {
        return regdb_close();
 }
@@ -126,8 +137,8 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 {
        WERROR          result = WERR_OK;
        struct registry_key *regkey;
-       REGISTRY_KEY *key;
-       REGSUBKEY_CTR   *subkeys = NULL;
+       struct registry_key_handle *key;
+       struct regsubkey_ctr    *subkeys = NULL;
 
        DEBUG(7,("regkey_open_onelevel: name = [%s]\n", name));
 
@@ -135,7 +146,8 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 
        if (!(regkey = TALLOC_ZERO_P(mem_ctx, struct registry_key)) ||
            !(regkey->token = dup_nt_token(regkey, token)) ||
-           !(regkey->key = TALLOC_ZERO_P(regkey, REGISTRY_KEY))) {
+           !(regkey->key = TALLOC_ZERO_P(regkey, struct registry_key_handle)))
+       {
                result = WERR_NOMEM;
                goto done;
        }
@@ -146,9 +158,9 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 
        key = regkey->key;
        talloc_set_destructor(key, regkey_destructor);
-               
+
        /* initialization */
-       
+
        key->type = REG_KEY_GENERIC;
 
        if (name[0] == '\0') {
@@ -180,12 +192,12 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 
        if( StrnCaseCmp(key->name, KEY_HKPD, strlen(KEY_HKPD)) == 0 )
                key->type = REG_KEY_HKPD;
-       
+
        /* Look up the table of registry I/O operations */
 
-       if ( !(key->hook = reghook_cache_find( key->name )) ) {
-               DEBUG(0,("reg_open_onelevel: Failed to assign "
-                        "REGISTRY_HOOK to [%s]\n", key->name ));
+       if ( !(key->ops = reghook_cache_find( key->name )) ) {
+               DEBUG(0,("reg_open_onelevel: Failed to assign "
+                        "registry_ops to [%s]\n", key->name ));
                result = WERR_BADFILE;
                goto done;
        }
@@ -193,8 +205,8 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
        /* check if the path really exists; failed is indicated by -1 */
        /* if the subkey count failed, bail out */
 
-       if ( !(subkeys = TALLOC_ZERO_P( key, REGSUBKEY_CTR )) ) {
-               result = WERR_NOMEM;
+       result = regsubkey_ctr_init(key, &subkeys);
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -213,7 +225,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 
        *pregkey = regkey;
        result = WERR_OK;
-       
+
 done:
        if ( !W_ERROR_IS_OK(result) ) {
                TALLOC_FREE(regkey);
@@ -271,7 +283,7 @@ WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent,
 
                err = regkey_open_onelevel(mem_ctx, direct_parent,
                                           name_component, parent->token,
-                                          SEC_RIGHTS_ENUM_SUBKEYS, &tmp);
+                                          KEY_ENUMERATE_SUB_KEYS, &tmp);
                SAFE_FREE(name_component);
 
                if (!W_ERROR_IS_OK(err)) {
@@ -300,7 +312,7 @@ WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key *key,
 {
        WERROR err;
 
-       if (!(key->key->access_granted & SEC_RIGHTS_ENUM_SUBKEYS)) {
+       if (!(key->key->access_granted & KEY_ENUMERATE_SUB_KEYS)) {
                return WERR_ACCESS_DENIED;
        }
 
@@ -308,11 +320,13 @@ WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key *key,
                return err;
        }
 
-       if (idx >= key->subkeys->num_subkeys) {
+       if (idx >= regsubkey_ctr_numkeys(key->subkeys)) {
                return WERR_NO_MORE_ITEMS;
        }
 
-       if (!(*name = talloc_strdup(mem_ctx, key->subkeys->subkeys[idx]))) {
+       if (!(*name = talloc_strdup(mem_ctx,
+                       regsubkey_ctr_specific_key(key->subkeys, idx))))
+       {
                return WERR_NOMEM;
        }
 
@@ -327,9 +341,10 @@ WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
                     uint32 idx, char **pname, struct registry_value **pval)
 {
        struct registry_value *val;
+       struct regval_blob *blob;
        WERROR err;
 
-       if (!(key->key->access_granted & SEC_RIGHTS_QUERY_VALUE)) {
+       if (!(key->key->access_granted & KEY_QUERY_VALUE)) {
                return WERR_ACCESS_DENIED;
        }
 
@@ -337,23 +352,24 @@ WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
                return err;
        }
 
-       if (idx >= key->values->num_values) {
+       if (idx >= regval_ctr_numvals(key->values)) {
                return WERR_NO_MORE_ITEMS;
        }
 
-       err = registry_pull_value(mem_ctx, &val,
-                                 key->values->values[idx]->type,
-                                 key->values->values[idx]->data_p,
-                                 key->values->values[idx]->size,
-                                 key->values->values[idx]->size);
-       if (!W_ERROR_IS_OK(err)) {
-               return err;
+       blob = regval_ctr_specific_value(key->values, idx);
+
+       val = talloc_zero(mem_ctx, struct registry_value);
+       if (val == NULL) {
+               return WERR_NOMEM;
        }
 
+       val->type = regval_type(blob);
+       val->data = data_blob_talloc(mem_ctx, regval_data_p(blob), regval_size(blob));
+
        if (pname
            && !(*pname = talloc_strdup(
-                        mem_ctx, key->values->values[idx]->valuename))) {
-               SAFE_FREE(val);
+                        mem_ctx, regval_name(blob)))) {
+               TALLOC_FREE(val);
                return WERR_NOMEM;
        }
 
@@ -367,7 +383,7 @@ WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
        WERROR err;
        uint32 i;
 
-       if (!(key->key->access_granted & SEC_RIGHTS_QUERY_VALUE)) {
+       if (!(key->key->access_granted & KEY_QUERY_VALUE)) {
                return WERR_ACCESS_DENIED;
        }
 
@@ -375,8 +391,10 @@ WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
                return err;
        }
 
-       for (i=0; i<key->values->num_values; i++) {
-               if (strequal(key->values->values[i]->valuename, name)) {
+       for (i=0; i < regval_ctr_numvals(key->values); i++) {
+               struct regval_blob *blob;
+               blob = regval_ctr_specific_value(key->values, i);
+               if (strequal(regval_name(blob), name)) {
                        return reg_enumvalue(mem_ctx, key, i, NULL, pval);
                }
        }
@@ -384,6 +402,56 @@ WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
        return WERR_BADFILE;
 }
 
+WERROR reg_querymultiplevalues(TALLOC_CTX *mem_ctx,
+                              struct registry_key *key,
+                              uint32_t num_names,
+                              const char **names,
+                              uint32_t *pnum_vals,
+                              struct registry_value **pvals)
+{
+       WERROR err;
+       uint32_t i, n, found = 0;
+       struct registry_value *vals;
+
+       if (num_names == 0) {
+               return WERR_OK;
+       }
+
+       if (!(key->key->access_granted & KEY_QUERY_VALUE)) {
+               return WERR_ACCESS_DENIED;
+       }
+
+       if (!(W_ERROR_IS_OK(err = fill_value_cache(key)))) {
+               return err;
+       }
+
+       vals = talloc_zero_array(mem_ctx, struct registry_value, num_names);
+       if (vals == NULL) {
+               return WERR_NOMEM;
+       }
+
+       for (n=0; n < num_names; n++) {
+               for (i=0; i < regval_ctr_numvals(key->values); i++) {
+                       struct regval_blob *blob;
+                       blob = regval_ctr_specific_value(key->values, i);
+                       if (strequal(regval_name(blob), names[n])) {
+                               struct registry_value *v;
+                               err = reg_enumvalue(mem_ctx, key, i, NULL, &v);
+                               if (!W_ERROR_IS_OK(err)) {
+                                       return err;
+                               }
+                               vals[n] = *v;
+                               found++;
+                       }
+               }
+       }
+
+       *pvals = vals;
+       *pnum_vals = found;
+
+       return WERR_OK;
+}
+
 WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
                        uint32_t *max_subkeylen, uint32_t *max_subkeysize, 
                        uint32_t *num_values, uint32_t *max_valnamelen, 
@@ -396,7 +464,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
        WERROR err;
        struct security_descriptor *secdesc;
 
-       if (!(key->key->access_granted & SEC_RIGHTS_QUERY_VALUE)) {
+       if (!(key->key->access_granted & KEY_QUERY_VALUE)) {
                return WERR_ACCESS_DENIED;
        }
 
@@ -406,23 +474,25 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
        }
 
        max_len = 0;
-       for (i=0; i<key->subkeys->num_subkeys; i++) {
-               max_len = MAX(max_len, strlen(key->subkeys->subkeys[i]));
+       for (i=0; i< regsubkey_ctr_numkeys(key->subkeys); i++) {
+               max_len = MAX(max_len,
+                       strlen(regsubkey_ctr_specific_key(key->subkeys, i)));
        }
 
-       *num_subkeys = key->subkeys->num_subkeys;
+       *num_subkeys = regsubkey_ctr_numkeys(key->subkeys);
        *max_subkeylen = max_len;
        *max_subkeysize = 0;    /* Class length? */
 
        max_len = 0;
        max_size = 0;
-       for (i=0; i<key->values->num_values; i++) {
-               max_len = MAX(max_len,
-                             strlen(key->values->values[i]->valuename));
-               max_size = MAX(max_size, key->values->values[i]->size);
+       for (i=0; i < regval_ctr_numvals(key->values); i++) {
+               struct regval_blob *blob;
+               blob = regval_ctr_specific_value(key->values, i);
+               max_len = MAX(max_len, strlen(regval_name(blob)));
+               max_size = MAX(max_size, regval_size(blob));
        }
 
-       *num_values = key->values->num_values;
+       *num_values = regval_ctr_numvals(key->values);
        *max_valnamelen = max_len;
        *max_valbufsize = max_size;
 
@@ -469,7 +539,7 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
                *end = '\0';
 
                err = reg_createkey(mem_ctx, key, path,
-                                   SEC_RIGHTS_ENUM_SUBKEYS, &tmp, &action);
+                                   KEY_ENUMERATE_SUB_KEYS, &tmp, &action);
                if (!W_ERROR_IS_OK(err)) {
                        goto done;
                }
@@ -507,7 +577,7 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
         * with ENUM_SUBKEY access.
         */
 
-       err = reg_openkey(mem_ctx, key, "", SEC_RIGHTS_CREATE_SUBKEY,
+       err = reg_openkey(mem_ctx, key, "", KEY_CREATE_SUB_KEY,
                          &create_parent);
        if (!W_ERROR_IS_OK(err)) {
                goto done;
@@ -520,14 +590,8 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
        err = fill_subkey_cache(create_parent);
        if (!W_ERROR_IS_OK(err)) goto done;
 
-       err = regsubkey_ctr_addkey(create_parent->subkeys, path);
-       if (!W_ERROR_IS_OK(err)) goto done;
-
-       if (!store_reg_keys(create_parent->key, create_parent->subkeys)) {
-               TALLOC_FREE(create_parent->subkeys);
-               err = WERR_REG_IO_FAILURE;
-               goto done;
-       }
+       err = create_reg_subkey(key->key, path);
+       W_ERROR_NOT_OK_GOTO_DONE(err);
 
        /*
         * Now open the newly created key
@@ -546,40 +610,36 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
 WERROR reg_deletekey(struct registry_key *parent, const char *path)
 {
        WERROR err;
-       TALLOC_CTX *mem_ctx;
        char *name, *end;
-       int num_subkeys;
        struct registry_key *tmp_key, *key;
+       TALLOC_CTX *mem_ctx = talloc_stackframe();
 
-       if (!(mem_ctx = talloc_init("reg_createkey"))) return WERR_NOMEM;
-
-       if (!(name = talloc_strdup(mem_ctx, path))) {
+       name = talloc_strdup(mem_ctx, path);
+       if (name == NULL) {
                err = WERR_NOMEM;
-               goto error;
+               goto done;
        }
 
        /* check if the key has subkeys */
        err = reg_openkey(mem_ctx, parent, name, REG_KEY_READ, &key);
-       if (!W_ERROR_IS_OK(err)) {
-               goto error;
-       }
-       if (!W_ERROR_IS_OK(err = fill_subkey_cache(key))) {
-               goto error;
-       }
-       if (key->subkeys->num_subkeys > 0) {
+       W_ERROR_NOT_OK_GOTO_DONE(err);
+
+       err = fill_subkey_cache(key);
+       W_ERROR_NOT_OK_GOTO_DONE(err);
+
+       if (regsubkey_ctr_numkeys(key->subkeys) > 0) {
                err = WERR_ACCESS_DENIED;
-               goto error;
+               goto done;
        }
 
        /* no subkeys - proceed with delete */
-       if ((end = strrchr(name, '\\')) != NULL) {
+       end = strrchr(name, '\\');
+       if (end != NULL) {
                *end = '\0';
 
                err = reg_openkey(mem_ctx, parent, name,
-                                 SEC_RIGHTS_CREATE_SUBKEY, &tmp_key);
-               if (!W_ERROR_IS_OK(err)) {
-                       goto error;
-               }
+                                 KEY_CREATE_SUB_KEY, &tmp_key);
+               W_ERROR_NOT_OK_GOTO_DONE(err);
 
                parent = tmp_key;
                name = end+1;
@@ -587,31 +647,12 @@ WERROR reg_deletekey(struct registry_key *parent, const char *path)
 
        if (name[0] == '\0') {
                err = WERR_INVALID_PARAM;
-               goto error;
-       }
-
-       if (!W_ERROR_IS_OK(err = fill_subkey_cache(parent))) {
-               goto error;
-       }
-
-       num_subkeys = parent->subkeys->num_subkeys;
-
-       if (regsubkey_ctr_delkey(parent->subkeys, name) == num_subkeys) {
-               err = WERR_BADFILE;
-               goto error;
-       }
-
-       if (!store_reg_keys(parent->key, parent->subkeys)) {
-               TALLOC_FREE(parent->subkeys);
-               err = WERR_REG_IO_FAILURE;
-               goto error;
+               goto done;
        }
 
-       regkey_set_secdesc(key->key, NULL);
-
-       err = WERR_OK;
+       err = delete_reg_subkey(parent->key, name);
 
- error:
+done:
        TALLOC_FREE(mem_ctx);
        return err;
 }
@@ -620,10 +661,9 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
                    const struct registry_value *val)
 {
        WERROR err;
-       DATA_BLOB value_data;
        int res;
 
-       if (!(key->key->access_granted & SEC_RIGHTS_SET_VALUE)) {
+       if (!(key->key->access_granted & KEY_SET_VALUE)) {
                return WERR_ACCESS_DENIED;
        }
 
@@ -631,14 +671,8 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
                return err;
        }
 
-       err = registry_push_value(key, val, &value_data);
-       if (!W_ERROR_IS_OK(err)) {
-               return err;
-       }
-
        res = regval_ctr_addvalue(key->values, name, val->type,
-                                 (char *)value_data.data, value_data.length);
-       TALLOC_FREE(value_data.data);
+                                 val->data.data, val->data.length);
 
        if (res == 0) {
                TALLOC_FREE(key->values);
@@ -653,11 +687,24 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
        return WERR_OK;
 }
 
+static WERROR reg_value_exists(struct registry_key *key, const char *name)
+{
+       struct regval_blob *blob;
+
+       blob = regval_ctr_getvalue(key->values, name);
+
+       if (blob == NULL) {
+               return WERR_BADFILE;
+       } else {
+               return WERR_OK;
+       }
+}
+
 WERROR reg_deletevalue(struct registry_key *key, const char *name)
 {
        WERROR err;
 
-       if (!(key->key->access_granted & SEC_RIGHTS_SET_VALUE)) {
+       if (!(key->key->access_granted & KEY_SET_VALUE)) {
                return WERR_ACCESS_DENIED;
        }
 
@@ -665,6 +712,11 @@ WERROR reg_deletevalue(struct registry_key *key, const char *name)
                return err;
        }
 
+       err = reg_value_exists(key, name);
+       if (!W_ERROR_IS_OK(err)) {
+               return err;
+       }
+
        regval_ctr_delvalue(key->values, name);
 
        if (!store_reg_values(key->key, key->values)) {
@@ -706,18 +758,18 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
                            REGF_NK_REC *key)
 {
        REGF_NK_REC *subkey;
-       REGISTRY_KEY registry_key;
-       REGVAL_CTR *values;
-       REGSUBKEY_CTR *subkeys;
+       struct registry_key_handle registry_key;
+       struct regval_ctr *values;
+       struct regsubkey_ctr *subkeys;
        int i;
        char *path = NULL;
        WERROR result = WERR_OK;
 
-       /* initialize the REGISTRY_KEY structure */
+       /* initialize the struct registry_key_handle structure */
 
-       registry_key.hook = reghook_cache_find(topkeypath);
-       if (!registry_key.hook) {
-               DEBUG(0, ("reg_load_tree: Failed to assigned a REGISTRY_HOOK "
+       registry_key.ops = reghook_cache_find(topkeypath);
+       if (!registry_key.ops) {
+               DEBUG(0, ("reg_load_tree: Failed to assign registry_ops "
                          "to [%s]\n", topkeypath));
                return WERR_BADFILE;
        }
@@ -730,30 +782,30 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
 
        /* now start parsing the values and subkeys */
 
-       subkeys = TALLOC_ZERO_P(regfile->mem_ctx, REGSUBKEY_CTR);
-       if (subkeys == NULL) {
-               return WERR_NOMEM;
-       }
+       result = regsubkey_ctr_init(regfile->mem_ctx, &subkeys);
+       W_ERROR_NOT_OK_RETURN(result);
 
-       values = TALLOC_ZERO_P(subkeys, REGVAL_CTR);
-       if (values == NULL) {
-               return WERR_NOMEM;
-       }
+       result = regval_ctr_init(subkeys, &values);
+       W_ERROR_NOT_OK_RETURN(result);
 
-       /* copy values into the REGVAL_CTR */
+       /* copy values into the struct regval_ctr */
 
        for (i=0; i<key->num_values; i++) {
                regval_ctr_addvalue(values, key->values[i].valuename,
                                    key->values[i].type,
-                                   (char*)key->values[i].data,
+                                   key->values[i].data,
                                    (key->values[i].data_size & ~VK_DATA_IN_OFFSET));
        }
 
-       /* copy subkeys into the REGSUBKEY_CTR */
+       /* copy subkeys into the struct regsubkey_ctr */
 
        key->subkey_index = 0;
        while ((subkey = regfio_fetch_subkey( regfile, key ))) {
-               regsubkey_ctr_addkey(subkeys, subkey->keyname);
+               result = regsubkey_ctr_addkey(subkeys, subkey->keyname);
+               if (!W_ERROR_IS_OK(result)) {
+                       TALLOC_FREE(subkeys);
+                       return result;
+               }
        }
 
        /* write this key and values out */
@@ -794,7 +846,8 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
 /*******************************************************************
  ********************************************************************/
 
-static WERROR restore_registry_key(REGISTRY_KEY *krecord, const char *fname)
+static WERROR restore_registry_key(struct registry_key_handle *krecord,
+                                  const char *fname)
 {
        REGF_FILE *regfile;
        REGF_NK_REC *rootkey;
@@ -838,16 +891,16 @@ static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
                             REGF_NK_REC *parent)
 {
        REGF_NK_REC *key;
-       REGVAL_CTR *values;
-       REGSUBKEY_CTR *subkeys;
+       struct regval_ctr *values;
+       struct regsubkey_ctr *subkeys;
        int i, num_subkeys;
        char *key_tmp = NULL;
        char *keyname, *parentpath;
        char *subkeypath = NULL;
        char *subkeyname;
-       REGISTRY_KEY registry_key;
+       struct registry_key_handle registry_key;
        WERROR result = WERR_OK;
-       SEC_DESC *sec_desc = NULL;
+       struct security_descriptor *sec_desc = NULL;
 
        if (!regfile) {
                return WERR_GENERAL_FAILURE;
@@ -871,7 +924,7 @@ static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
                keyname = parentpath;
        }
 
-       /* we need a REGISTRY_KEY object here to enumerate subkeys and values */
+       /* we need a registry_key_handle object here to enumerate subkeys and values */
 
        ZERO_STRUCT(registry_key);
 
@@ -880,22 +933,18 @@ static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
                return WERR_NOMEM;
        }
 
-       registry_key.hook = reghook_cache_find(registry_key.name);
-       if (registry_key.hook == NULL) {
+       registry_key.ops = reghook_cache_find(registry_key.name);
+       if (registry_key.ops == NULL) {
                return WERR_BADFILE;
        }
 
        /* lookup the values and subkeys */
 
-       subkeys = TALLOC_ZERO_P(regfile->mem_ctx, REGSUBKEY_CTR);
-       if (subkeys == NULL) {
-               return WERR_NOMEM;
-       }
+       result = regsubkey_ctr_init(regfile->mem_ctx, &subkeys);
+       W_ERROR_NOT_OK_RETURN(result);
 
-       values = TALLOC_ZERO_P(subkeys, REGVAL_CTR);
-       if (values == NULL) {
-               return WERR_NOMEM;
-       }
+       result = regval_ctr_init(subkeys, &values); 
+       W_ERROR_NOT_OK_RETURN(result);
 
        fetch_reg_keys(&registry_key, subkeys);
        fetch_reg_values(&registry_key, values);
@@ -939,7 +988,8 @@ done:
        return result;
 }
 
-static WERROR backup_registry_key(REGISTRY_KEY *krecord, const char *fname)
+static WERROR backup_registry_key(struct registry_key_handle *krecord,
+                                 const char *fname)
 {
        REGF_FILE *regfile;
        WERROR result;
@@ -979,7 +1029,7 @@ WERROR reg_deleteallvalues(struct registry_key *key)
        WERROR err;
        int i;
 
-       if (!(key->key->access_granted & SEC_RIGHTS_SET_VALUE)) {
+       if (!(key->key->access_granted & KEY_SET_VALUE)) {
                return WERR_ACCESS_DENIED;
        }
 
@@ -987,8 +1037,10 @@ WERROR reg_deleteallvalues(struct registry_key *key)
                return err;
        }
 
-       for (i=0; i<key->values->num_values; i++) {
-               regval_ctr_delvalue(key->values, key->values->values[i]->valuename);
+       for (i=0; i < regval_ctr_numvals(key->values); i++) {
+               struct regval_blob *blob;
+               blob = regval_ctr_specific_value(key->values, i);
+               regval_ctr_delvalue(key->values, regval_name(blob));
        }
 
        if (!store_reg_values(key->key, key->values)) {
@@ -1035,7 +1087,7 @@ WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
 
        *p = '\0';
 
-       err = reg_openhive(mem_ctx, path, SEC_RIGHTS_ENUM_SUBKEYS, token,
+       err = reg_openhive(mem_ctx, path, KEY_ENUMERATE_SUB_KEYS, token,
                           &hive);
        if (!W_ERROR_IS_OK(err)) {
                SAFE_FREE(path);
@@ -1069,6 +1121,7 @@ static WERROR reg_deletekey_recursive_internal(TALLOC_CTX *ctx,
        WERROR werr = WERR_OK;
        struct registry_key *key;
        char *subkey_name = NULL;
+       uint32 i;
 
        mem_ctx = talloc_new(ctx);
        if (mem_ctx == NULL) {
@@ -1082,25 +1135,21 @@ static WERROR reg_deletekey_recursive_internal(TALLOC_CTX *ctx,
                goto done;
        }
 
-       while (W_ERROR_IS_OK(werr = reg_enumkey(mem_ctx, key, 0,
-                                               &subkey_name, NULL)))
-       {
+       werr = fill_subkey_cache(key);
+       W_ERROR_NOT_OK_GOTO_DONE(werr);
+
+       /*
+        * loop from top to bottom for perfomance:
+        * this way, we need to rehash the regsubkey containers less
+        */
+       for (i = regsubkey_ctr_numkeys(key->subkeys) ; i > 0; i--) {
+               subkey_name = regsubkey_ctr_specific_key(key->subkeys, i-1);
                werr = reg_deletekey_recursive_internal(mem_ctx, key,
-                                                       subkey_name,
-                                                       true);
-               if (!W_ERROR_IS_OK(werr)) {
-                       goto done;
-               }
-       }
-       if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
-               DEBUG(1, ("reg_deletekey_recursive_internal: "
-                         "Error enumerating subkeys: %s\n",
-                         dos_errstr(werr)));
-               goto done;
+                                       subkey_name,
+                                       true);
+               W_ERROR_NOT_OK_GOTO_DONE(werr);
        }
 
-       werr = WERR_OK;
-
        if (del_key) {
                /* now delete the actual key */
                werr = reg_deletekey(parent, path);
@@ -1111,18 +1160,57 @@ done:
        return werr;
 }
 
+static WERROR reg_deletekey_recursive_trans(TALLOC_CTX *ctx,
+                                           struct registry_key *parent,
+                                           const char *path,
+                                           bool del_key)
+{
+       WERROR werr;
+
+       werr = regdb_transaction_start();
+       if (!W_ERROR_IS_OK(werr)) {
+               DEBUG(0, ("reg_deletekey_recursive_trans: "
+                         "error starting transaction: %s\n",
+                         win_errstr(werr)));
+               return werr;
+       }
+
+       werr = reg_deletekey_recursive_internal(ctx, parent, path, del_key);
+
+       if (!W_ERROR_IS_OK(werr)) {
+               DEBUG(1, (__location__ " failed to delete key '%s' from key "
+                         "'%s': %s\n", path, parent->key->name,
+                         win_errstr(werr)));
+               werr = regdb_transaction_cancel();
+               if (!W_ERROR_IS_OK(werr)) {
+                       DEBUG(0, ("reg_deletekey_recursive_trans: "
+                                 "error cancelling transaction: %s\n",
+                                 win_errstr(werr)));
+               }
+       } else {
+               werr = regdb_transaction_commit();
+               if (!W_ERROR_IS_OK(werr)) {
+                       DEBUG(0, ("reg_deletekey_recursive_trans: "
+                                 "error committing transaction: %s\n",
+                                 win_errstr(werr)));
+               }
+       }
+
+       return werr;
+}
+
 WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
                               struct registry_key *parent,
                               const char *path)
 {
-       return reg_deletekey_recursive_internal(ctx, parent, path, true);
+       return reg_deletekey_recursive_trans(ctx, parent, path, true);
 }
 
 WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx,
                                   struct registry_key *parent,
                                   const char *path)
 {
-       return reg_deletekey_recursive_internal(ctx, parent, path, false);
+       return reg_deletekey_recursive_trans(ctx, parent, path, false);
 }
 
 #if 0
@@ -1170,7 +1258,7 @@ WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
 
        err = reg_openhive(mem_ctx, path,
                           (strchr(p+1, '\\') != NULL) ?
-                          SEC_RIGHTS_ENUM_SUBKEYS : SEC_RIGHTS_CREATE_SUBKEY,
+                          KEY_ENUMERATE_SUB_KEYS : KEY_CREATE_SUB_KEY,
                           token, &hive);
        if (!W_ERROR_IS_OK(err)) {
                SAFE_FREE(path);
@@ -1210,7 +1298,7 @@ WERROR reg_delete_path(const struct nt_user_token *token,
 
        err = reg_openhive(NULL, path,
                           (strchr(p+1, '\\') != NULL) ?
-                          SEC_RIGHTS_ENUM_SUBKEYS : SEC_RIGHTS_CREATE_SUBKEY,
+                          KEY_ENUMERATE_SUB_KEYS : KEY_CREATE_SUB_KEY,
                           token, &hive);
        if (!W_ERROR_IS_OK(err)) {
                SAFE_FREE(path);