diff options
| author | Günther Deschner <gd@samba.org> | 2007-11-06 00:50:47 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2007-11-06 00:50:47 +0100 |
| commit | 99d9993fdb9cdf5ac054329ddf5e9c4f258f9049 (patch) | |
| tree | ae7ed28f3fc736fc72919a47d2479ee7b015c58e /source3/registry/reg_api.c | |
| parent | 3fd2d4ed856bc4fa053e1c03926ca71bb4ab1a9f (diff) | |
| download | samba-99d9993fdb9cdf5ac054329ddf5e9c4f258f9049.tar.gz samba-99d9993fdb9cdf5ac054329ddf5e9c4f258f9049.tar.bz2 samba-99d9993fdb9cdf5ac054329ddf5e9c4f258f9049.zip | |
When deleting a key from the registry make sure the non-default
security descriptor gets deleted as well.
Guenther
(This used to be commit d140d68537225b6a6a99be3d9b09354e3f6ad8c9)
Diffstat (limited to 'source3/registry/reg_api.c')
| -rw-r--r-- | source3/registry/reg_api.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 17a0efe007..b3d024d7b4 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -498,7 +498,7 @@ WERROR reg_deletekey(struct registry_key *parent, const char *path) TALLOC_CTX *mem_ctx; char *name, *end; int num_subkeys; - struct registry_key *tmp_key; + struct registry_key *tmp_key, *key; if (!(mem_ctx = talloc_init("reg_createkey"))) return WERR_NOMEM; @@ -508,14 +508,14 @@ WERROR reg_deletekey(struct registry_key *parent, const char *path) } /* check if the key has subkeys */ - err = reg_openkey(mem_ctx, parent, name, REG_KEY_READ, &tmp_key); + 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(tmp_key))) { + if (!W_ERROR_IS_OK(err = fill_subkey_cache(key))) { goto error; } - if (tmp_key->subkeys->num_subkeys > 0) { + if (key->subkeys->num_subkeys > 0) { err = WERR_ACCESS_DENIED; goto error; } @@ -556,7 +556,10 @@ WERROR reg_deletekey(struct registry_key *parent, const char *path) goto error; } + regkey_set_secdesc(key->key, NULL); + err = WERR_OK; + error: TALLOC_FREE(mem_ctx); return err; |