s3-registry: remove some unused headers.
[amitay/samba.git] / source3 / registry / reg_api.c
index 0eba8e0d01d13e5fde0be9ff5b16dcb7d9fae60e..935d2441afa5fdf1e282dd16d631abf4e4b859e1 100644 (file)
@@ -2,7 +2,7 @@
  *  Unix SMB/CIFS implementation.
  *  Virtual Windows Registry Layer
  *  Copyright (C) Volker Lendecke 2006
- *  Copyright (C) Michael Adam 2007-2008
+ *  Copyright (C) Michael Adam 2007-2010
  *
  *  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
  * 0x1a                winreg_GetVersion                       reg_getversion
  * 0x1b                winreg_OpenHKCC
  * 0x1c                winreg_OpenHKDD
- * 0x1d                winreg_QueryMultipleValues
+ * 0x1d                winreg_QueryMultipleValues              reg_querymultiplevalues
  * 0x1e                winreg_InitiateSystemShutdownEx
  * 0x1f                winreg_SaveKeyEx
  * 0x20                winreg_OpenHKPT
  * 0x21                winreg_OpenHKPN
- * 0x22                winreg_QueryMultipleValues2
+ * 0x22                winreg_QueryMultipleValues2             reg_querymultiplevalues
  *
  */
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_api.h"
 #include "reg_cachehook.h"
-#include "regfio.h"
-#include "reg_util_internal.h"
 #include "reg_backend_db.h"
 #include "reg_dispatcher.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, struct 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;
@@ -126,7 +129,7 @@ static int regkey_destructor(struct registry_key_handle *key)
 static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx, 
                                   struct registry_key *parent,
                                   const char *name,
-                                  const struct nt_user_token *token,
+                                  const struct security_token *token,
                                   uint32 access_desired,
                                   struct registry_key **pregkey)
 {
@@ -231,7 +234,7 @@ done:
 
 WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
                    uint32 desired_access,
-                   const struct nt_user_token *token,
+                   const struct security_token *token,
                    struct registry_key **pkey)
 {
        SMB_ASSERT(hive != NULL);
@@ -336,6 +339,7 @@ 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 & KEY_QUERY_VALUE)) {
@@ -346,23 +350,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;
        }
 
@@ -384,8 +389,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);
                }
        }
@@ -393,6 +400,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, 
@@ -426,13 +483,14 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
 
        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;
 
@@ -465,16 +523,6 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
        char *path, *end;
        WERROR err;
 
-       /*
-        * We must refuse to handle subkey-paths containing
-        * a '/' character because at a lower level, after
-        * normalization, '/' is treated as a key separator
-        * just like '\\'.
-        */
-       if (strchr(subkeypath, '/') != NULL) {
-               return WERR_INVALID_PARAM;
-       }
-
        if (!(mem_ctx = talloc_new(ctx))) return WERR_NOMEM;
 
        if (!(path = talloc_strdup(mem_ctx, subkeypath))) {
@@ -610,8 +658,8 @@ done:
 WERROR reg_setvalue(struct registry_key *key, const char *name,
                    const struct registry_value *val)
 {
+       struct regval_blob *existing;
        WERROR err;
-       DATA_BLOB value_data;
        int res;
 
        if (!(key->key->access_granted & KEY_SET_VALUE)) {
@@ -622,14 +670,17 @@ 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;
+       existing = regval_ctr_getvalue(key->values, name);
+
+       if ((existing != NULL) &&
+           (regval_size(existing) == val->data.length) &&
+           (memcmp(regval_data_p(existing), val->data.data,
+                   val->data.length) == 0)) {
+               return WERR_OK;
        }
 
        res = regval_ctr_addvalue(key->values, name, val->type,
-                                 value_data.data, value_data.length);
-       TALLOC_FREE(value_data.data);
+                                 val->data.data, val->data.length);
 
        if (res == 0) {
                TALLOC_FREE(key->values);
@@ -646,15 +697,15 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
 
 static WERROR reg_value_exists(struct registry_key *key, const char *name)
 {
-       int i;
+       struct regval_blob *blob;
 
-       for (i=0; i<key->values->num_values; i++) {
-               if (strequal(key->values->values[i]->valuename, name)) {
-                       return WERR_OK;
-               }
-       }
+       blob = regval_ctr_getvalue(key->values, name);
 
-       return WERR_BADFILE;
+       if (blob == NULL) {
+               return WERR_BADFILE;
+       } else {
+               return WERR_OK;
+       }
 }
 
 WERROR reg_deletevalue(struct registry_key *key, const char *name)
@@ -706,281 +757,6 @@ WERROR reg_getversion(uint32_t *version)
        return WERR_OK;
 }
 
-/*******************************************************************
- Note: topkeypat is the *full* path that this *key will be
- loaded into (including the name of the key)
- ********************************************************************/
-
-static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
-                           REGF_NK_REC *key)
-{
-       REGF_NK_REC *subkey;
-       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 struct registry_key_handle structure */
-
-       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;
-       }
-
-       registry_key.name = talloc_strdup(regfile->mem_ctx, topkeypath);
-       if (!registry_key.name) {
-               DEBUG(0, ("reg_load_tree: Talloc failed for reg_key.name!\n"));
-               return WERR_NOMEM;
-       }
-
-       /* now start parsing the values and subkeys */
-
-       result = regsubkey_ctr_init(regfile->mem_ctx, &subkeys);
-       W_ERROR_NOT_OK_RETURN(result);
-
-       values = TALLOC_ZERO_P(subkeys, struct regval_ctr);
-       if (values == NULL) {
-               return WERR_NOMEM;
-       }
-
-       /* 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,
-                                   key->values[i].data,
-                                   (key->values[i].data_size & ~VK_DATA_IN_OFFSET));
-       }
-
-       /* copy subkeys into the struct regsubkey_ctr */
-
-       key->subkey_index = 0;
-       while ((subkey = regfio_fetch_subkey( regfile, key ))) {
-               result = regsubkey_ctr_addkey(subkeys, subkey->keyname);
-               if (!W_ERROR_IS_OK(result)) {
-                       TALLOC_FREE(subkeys);
-                       return result;
-               }
-       }
-
-       /* write this key and values out */
-
-       if (!store_reg_values(&registry_key, values)
-           || !store_reg_keys(&registry_key, subkeys))
-       {
-               DEBUG(0,("reg_load_tree: Failed to load %s!\n", topkeypath));
-               result = WERR_REG_IO_FAILURE;
-       }
-
-       TALLOC_FREE(subkeys);
-
-       if (!W_ERROR_IS_OK(result)) {
-               return result;
-       }
-
-       /* now continue to load each subkey registry tree */
-
-       key->subkey_index = 0;
-       while ((subkey = regfio_fetch_subkey(regfile, key))) {
-               path = talloc_asprintf(regfile->mem_ctx,
-                                      "%s\\%s",
-                                      topkeypath,
-                                      subkey->keyname);
-               if (path == NULL) {
-                       return WERR_NOMEM;
-               }
-               result = reg_load_tree(regfile, path, subkey);
-               if (!W_ERROR_IS_OK(result)) {
-                       break;
-               }
-       }
-
-       return result;
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static WERROR restore_registry_key(struct registry_key_handle *krecord,
-                                  const char *fname)
-{
-       REGF_FILE *regfile;
-       REGF_NK_REC *rootkey;
-       WERROR result;
-
-       /* open the registry file....fail if the file already exists */
-
-       regfile = regfio_open(fname, (O_RDONLY), 0);
-       if (regfile == NULL) {
-               DEBUG(0, ("restore_registry_key: failed to open \"%s\" (%s)\n",
-                         fname, strerror(errno)));
-               return ntstatus_to_werror(map_nt_error_from_unix(errno));
-       }
-
-       /* get the rootkey from the regf file and then load the tree
-          via recursive calls */
-
-       if (!(rootkey = regfio_rootkey(regfile))) {
-               regfio_close(regfile);
-               return WERR_REG_FILE_INVALID;
-       }
-
-       result = reg_load_tree(regfile, krecord->name, rootkey);
-
-       /* cleanup */
-
-       regfio_close(regfile);
-
-       return result;
-}
-
-WERROR reg_restorekey(struct registry_key *key, const char *fname)
-{
-       return restore_registry_key(key->key, fname);
-}
-
-/********************************************************************
-********************************************************************/
-
-static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
-                            REGF_NK_REC *parent)
-{
-       REGF_NK_REC *key;
-       struct regval_ctr *values;
-       struct regsubkey_ctr *subkeys;
-       int i, num_subkeys;
-       char *key_tmp = NULL;
-       char *keyname, *parentpath;
-       char *subkeypath = NULL;
-       char *subkeyname;
-       struct registry_key_handle registry_key;
-       WERROR result = WERR_OK;
-       struct security_descriptor *sec_desc = NULL;
-
-       if (!regfile) {
-               return WERR_GENERAL_FAILURE;
-       }
-
-       if (!keypath) {
-               return WERR_OBJECT_PATH_INVALID;
-       }
-
-       /* split up the registry key path */
-
-       key_tmp = talloc_strdup(regfile->mem_ctx, keypath);
-       if (!key_tmp) {
-               return WERR_NOMEM;
-       }
-       if (!reg_split_key(key_tmp, &parentpath, &keyname)) {
-               return WERR_OBJECT_PATH_INVALID;
-       }
-
-       if (!keyname) {
-               keyname = parentpath;
-       }
-
-       /* we need a registry_key_handle object here to enumerate subkeys and values */
-
-       ZERO_STRUCT(registry_key);
-
-       registry_key.name = talloc_strdup(regfile->mem_ctx, keypath);
-       if (registry_key.name == NULL) {
-               return WERR_NOMEM;
-       }
-
-       registry_key.ops = reghook_cache_find(registry_key.name);
-       if (registry_key.ops == NULL) {
-               return WERR_BADFILE;
-       }
-
-       /* lookup the values and subkeys */
-
-       result = regsubkey_ctr_init(regfile->mem_ctx, &subkeys);
-       W_ERROR_NOT_OK_RETURN(result);
-
-       values = TALLOC_ZERO_P(subkeys, struct regval_ctr);
-       if (values == NULL) {
-               return WERR_NOMEM;
-       }
-
-       fetch_reg_keys(&registry_key, subkeys);
-       fetch_reg_values(&registry_key, values);
-
-       result = regkey_get_secdesc(regfile->mem_ctx, &registry_key, &sec_desc);
-       if (!W_ERROR_IS_OK(result)) {
-               goto done;
-       }
-
-       /* write out this key */
-
-       key = regfio_write_key(regfile, keyname, values, subkeys, sec_desc,
-                              parent);
-       if (key == NULL) {
-               result = WERR_CAN_NOT_COMPLETE;
-               goto done;
-       }
-
-       /* write each one of the subkeys out */
-
-       num_subkeys = regsubkey_ctr_numkeys(subkeys);
-       for (i=0; i<num_subkeys; i++) {
-               subkeyname = regsubkey_ctr_specific_key(subkeys, i);
-               subkeypath = talloc_asprintf(regfile->mem_ctx, "%s\\%s",
-                                            keypath, subkeyname);
-               if (subkeypath == NULL) {
-                       result = WERR_NOMEM;
-                       goto done;
-               }
-               result = reg_write_tree(regfile, subkeypath, key);
-               if (!W_ERROR_IS_OK(result))
-                       goto done;
-       }
-
-       DEBUG(6, ("reg_write_tree: wrote key [%s]\n", keypath));
-
-done:
-       TALLOC_FREE(subkeys);
-       TALLOC_FREE(registry_key.name);
-
-       return result;
-}
-
-static WERROR backup_registry_key(struct registry_key_handle *krecord,
-                                 const char *fname)
-{
-       REGF_FILE *regfile;
-       WERROR result;
-
-       /* open the registry file....fail if the file already exists */
-
-       regfile = regfio_open(fname, (O_RDWR|O_CREAT|O_EXCL),
-                             (S_IREAD|S_IWRITE));
-       if (regfile == NULL) {
-               DEBUG(0,("backup_registry_key: failed to open \"%s\" (%s)\n",
-                        fname, strerror(errno) ));
-               return ntstatus_to_werror(map_nt_error_from_unix(errno));
-       }
-
-       /* write the registry tree to the file  */
-
-       result = reg_write_tree(regfile, krecord->name, NULL);
-
-       /* cleanup */
-
-       regfio_close(regfile);
-
-       return result;
-}
-
-WERROR reg_savekey(struct registry_key *key, const char *fname)
-{
-       return backup_registry_key(key->key, fname);
-}
-
 /**********************************************************************
  * Higher level utility functions
  **********************************************************************/
@@ -998,8 +774,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)) {
@@ -1010,83 +788,20 @@ WERROR reg_deleteallvalues(struct registry_key *key)
        return WERR_OK;
 }
 
-/*
- * Utility function to open a complete registry path including the hive prefix.
- */
-
-WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
-                    uint32 desired_access, const struct nt_user_token *token,
-                    struct registry_key **pkey)
-{
-       struct registry_key *hive, *key;
-       char *path, *p;
-       WERROR err;
-
-       if (!(path = SMB_STRDUP(orig_path))) {
-               return WERR_NOMEM;
-       }
-
-       p = strchr(path, '\\');
-
-       if ((p == NULL) || (p[1] == '\0')) {
-               /*
-                * No key behind the hive, just return the hive
-                */
-
-               err = reg_openhive(mem_ctx, path, desired_access, token,
-                                  &hive);
-               if (!W_ERROR_IS_OK(err)) {
-                       SAFE_FREE(path);
-                       return err;
-               }
-               SAFE_FREE(path);
-               *pkey = hive;
-               return WERR_OK;
-       }
-
-       *p = '\0';
-
-       err = reg_openhive(mem_ctx, path, KEY_ENUMERATE_SUB_KEYS, token,
-                          &hive);
-       if (!W_ERROR_IS_OK(err)) {
-               SAFE_FREE(path);
-               return err;
-       }
-
-       err = reg_openkey(mem_ctx, hive, p+1, desired_access, &key);
-
-       TALLOC_FREE(hive);
-       SAFE_FREE(path);
-
-       if (!W_ERROR_IS_OK(err)) {
-               return err;
-       }
-
-       *pkey = key;
-       return WERR_OK;
-}
-
 /*
  * Utility function to delete a registry key with all its subkeys.
  * Note that reg_deletekey returns ACCESS_DENIED when called on a
  * key that has subkeys.
  */
-static WERROR reg_deletekey_recursive_internal(TALLOC_CTX *ctx,
-                                              struct registry_key *parent,
+static WERROR reg_deletekey_recursive_internal(struct registry_key *parent,
                                               const char *path,
                                               bool del_key)
 {
-       TALLOC_CTX *mem_ctx = NULL;
        WERROR werr = WERR_OK;
        struct registry_key *key;
        char *subkey_name = NULL;
        uint32 i;
-
-       mem_ctx = talloc_new(ctx);
-       if (mem_ctx == NULL) {
-               werr = WERR_NOMEM;
-               goto done;
-       }
+       TALLOC_CTX *mem_ctx = talloc_stackframe();
 
        /* recurse through subkeys first */
        werr = reg_openkey(mem_ctx, parent, path, REG_KEY_ALL, &key);
@@ -1103,9 +818,7 @@ static WERROR reg_deletekey_recursive_internal(TALLOC_CTX *ctx,
         */
        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);
+               werr = reg_deletekey_recursive_internal(key, subkey_name, true);
                W_ERROR_NOT_OK_GOTO_DONE(werr);
        }
 
@@ -1119,8 +832,7 @@ done:
        return werr;
 }
 
-static WERROR reg_deletekey_recursive_trans(TALLOC_CTX *ctx,
-                                           struct registry_key *parent,
+static WERROR reg_deletekey_recursive_trans(struct registry_key *parent,
                                            const char *path,
                                            bool del_key)
 {
@@ -1134,17 +846,24 @@ static WERROR reg_deletekey_recursive_trans(TALLOC_CTX *ctx,
                return werr;
        }
 
-       werr = reg_deletekey_recursive_internal(ctx, parent, path, del_key);
+       werr = reg_deletekey_recursive_internal(parent, path, del_key);
 
        if (!W_ERROR_IS_OK(werr)) {
+               WERROR werr2;
+
                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)) {
+
+               werr2 = regdb_transaction_cancel();
+               if (!W_ERROR_IS_OK(werr2)) {
                        DEBUG(0, ("reg_deletekey_recursive_trans: "
                                  "error cancelling transaction: %s\n",
-                                 win_errstr(werr)));
+                                 win_errstr(werr2)));
+                       /*
+                        * return the original werr or the
+                        * error from cancelling the transaction?
+                        */
                }
        } else {
                werr = regdb_transaction_commit();
@@ -1158,115 +877,15 @@ static WERROR reg_deletekey_recursive_trans(TALLOC_CTX *ctx,
        return werr;
 }
 
-WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
-                              struct registry_key *parent,
+WERROR reg_deletekey_recursive(struct registry_key *parent,
                               const char *path)
 {
-       return reg_deletekey_recursive_trans(ctx, parent, path, true);
+       return reg_deletekey_recursive_trans(parent, path, true);
 }
 
-WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx,
-                                  struct registry_key *parent,
+WERROR reg_deletesubkeys_recursive(struct registry_key *parent,
                                   const char *path)
 {
-       return reg_deletekey_recursive_trans(ctx, parent, path, false);
+       return reg_deletekey_recursive_trans(parent, path, false);
 }
 
-#if 0
-/* these two functions are unused. */
-
-/**
- * Utility function to create a registry key without opening the hive
- * before. Assumes the hive already exists.
- */
-
-WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
-                      uint32 desired_access,
-                      const struct nt_user_token *token,
-                      enum winreg_CreateAction *paction,
-                      struct registry_key **pkey)
-{
-       struct registry_key *hive;
-       char *path, *p;
-       WERROR err;
-
-       if (!(path = SMB_STRDUP(orig_path))) {
-               return WERR_NOMEM;
-       }
-
-       p = strchr(path, '\\');
-
-       if ((p == NULL) || (p[1] == '\0')) {
-               /*
-                * No key behind the hive, just return the hive
-                */
-
-               err = reg_openhive(mem_ctx, path, desired_access, token,
-                                  &hive);
-               if (!W_ERROR_IS_OK(err)) {
-                       SAFE_FREE(path);
-                       return err;
-               }
-               SAFE_FREE(path);
-               *pkey = hive;
-               *paction = REG_OPENED_EXISTING_KEY;
-               return WERR_OK;
-       }
-
-       *p = '\0';
-
-       err = reg_openhive(mem_ctx, path,
-                          (strchr(p+1, '\\') != NULL) ?
-                          KEY_ENUMERATE_SUB_KEYS : KEY_CREATE_SUB_KEY,
-                          token, &hive);
-       if (!W_ERROR_IS_OK(err)) {
-               SAFE_FREE(path);
-               return err;
-       }
-
-       err = reg_createkey(mem_ctx, hive, p+1, desired_access, pkey, paction);
-       SAFE_FREE(path);
-       TALLOC_FREE(hive);
-       return err;
-}
-
-/*
- * Utility function to create a registry key without opening the hive
- * before. Will not delete a hive.
- */
-
-WERROR reg_delete_path(const struct nt_user_token *token,
-                      const char *orig_path)
-{
-       struct registry_key *hive;
-       char *path, *p;
-       WERROR err;
-
-       if (!(path = SMB_STRDUP(orig_path))) {
-               return WERR_NOMEM;
-       }
-
-       p = strchr(path, '\\');
-
-       if ((p == NULL) || (p[1] == '\0')) {
-               SAFE_FREE(path);
-               return WERR_INVALID_PARAM;
-       }
-
-       *p = '\0';
-
-       err = reg_openhive(NULL, path,
-                          (strchr(p+1, '\\') != NULL) ?
-                          KEY_ENUMERATE_SUB_KEYS : KEY_CREATE_SUB_KEY,
-                          token, &hive);
-       if (!W_ERROR_IS_OK(err)) {
-               SAFE_FREE(path);
-               return err;
-       }
-
-       err = reg_deletekey(hive, p+1);
-       SAFE_FREE(path);
-       TALLOC_FREE(hive);
-       return err;
-}
-#endif /* #if 0 */