s3:registry: remove unneeded TALLOC_CTX argument from reg_deletekey_recursive

diff --git a/source3/include/proto.h b/source3/include/proto.h
index b80a434ddc99c37b93642707b1f9ec2e64910657..16429299557f5413f3a501c4388624c025746c1b 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5030,11 +5030,9 @@ WERROR reg_deleteallvalues(struct registry_key *key);
 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);
-WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
-                              struct registry_key *parent,
+WERROR reg_deletekey_recursive(struct registry_key *parent,
                               const char *path);
-WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx,
-                                  struct registry_key *parent,
+WERROR reg_deletesubkeys_recursive(struct registry_key *parent,
                                   const char *path);
 WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
                       uint32 desired_access,

diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index 54ce5348a74dd499c9ffb5fc4a18075e09ae3752..f769b60e5d6f74716ba98426faeac0c268ee687c 100644 (file)
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -685,7 +685,7 @@ static WERROR smbconf_reg_drop(struct smbconf_ctx *ctx)
                goto done;
        }
 
-       werr = reg_deletekey_recursive(mem_ctx, parent_key, p+1);
+       werr = reg_deletekey_recursive(parent_key, p+1);
 
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
@@ -877,8 +877,7 @@ static WERROR smbconf_reg_delete_share(struct smbconf_ctx *ctx,
        TALLOC_CTX *mem_ctx = talloc_stackframe();
 
        if (servicename != NULL) {
-               werr = reg_deletekey_recursive(mem_ctx, rpd(ctx)->base_key,
-                                              servicename);
+               werr = reg_deletekey_recursive(rpd(ctx)->base_key, servicename);
        } else {
                werr = smbconf_reg_delete_values(rpd(ctx)->base_key);
        }

diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c
index ddea35c644481f3159e1d3e13fc492e96aa5400f..0f822ea4e5b69997600a6de274ca4052cc15f41e 100644 (file)
--- a/source3/libgpo/gpext/scripts.c
+++ b/source3/libgpo/gpext/scripts.c
@@ -291,7 +291,7 @@ static WERROR scripts_apply(TALLOC_CTX *mem_ctx,
                                 section, count++);
        W_ERROR_HAVE_NO_MEMORY(keystr);
 
-       reg_deletekey_recursive(mem_ctx, root_key, keystr);
+       reg_deletekey_recursive(root_key, keystr);
 
        werr = gp_store_reg_subkey(mem_ctx, keystr,
                                   root_key, &root_key);

diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 9367bcae9c24b644d737dd169c32b25476fe5830..1f920c68e0f1dd54d0786e4f7b9711a3e1fa5a0a 100644 (file)
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -319,7 +319,7 @@ static WERROR gp_reg_del_groupmembership(TALLOC_CTX *mem_ctx,
                                           flags);
        W_ERROR_HAVE_NO_MEMORY(path);
 
-       return reg_deletekey_recursive(mem_ctx, key, path);
+       return reg_deletekey_recursive(key, path);
 
 }
 
@@ -440,7 +440,7 @@ static WERROR gp_del_reg_state(TALLOC_CTX *mem_ctx,
                               struct registry_key *key,
                               const char *path)
 {
-       return reg_deletesubkeys_recursive(mem_ctx, key, path);
+       return reg_deletesubkeys_recursive(key, path);
 }
 
 /****************************************************************

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 9aff4b05ca8277e97cfe4caf5651ce5288678ba9..ed2f44163f2ee63e2c5d8fa4a3f9f332628ed551 100644 (file)
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -1066,22 +1066,15 @@ WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
  * 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);
@@ -1098,9 +1091,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);
        }
 
@@ -1114,8 +1105,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)
 {
@@ -1129,7 +1119,7 @@ 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)) {
                DEBUG(1, (__location__ " failed to delete key '%s' from key "
@@ -1153,18 +1143,16 @@ 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

diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index c23b2a3ef8e487ef56438cd8c3b46b18c852d6e8..b3e4f862b7b4d94f56c7eaf7fae8b7a5bd298855 100644 (file)
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -834,7 +834,7 @@ static WERROR import_delete_key(struct import_ctx* ctx,
                name = subkeyname;
        }
 
-       werr = reg_deletekey_recursive(mem_ctx, parent, name);
+       werr = reg_deletekey_recursive(parent, name);
        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "reg_deletekey_recursive %s: %s\n", "failed",
                          win_errstr(werr));