summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-02-26 02:57:59 +0100
committerMichael Adam <obnox@samba.org>2009-02-26 13:22:55 +0100
commit270ab5544b9e2a26e00ccb4e27e24996bf2e9238 (patch)
treeac325ad09c2e930cbd9086ac20e477e4d87f5cba
parentae8c584218fd25016f9baf3106eb25a2faf15a97 (diff)
downloadsamba-270ab5544b9e2a26e00ccb4e27e24996bf2e9238.tar.gz
samba-270ab5544b9e2a26e00ccb4e27e24996bf2e9238.tar.bz2
samba-270ab5544b9e2a26e00ccb4e27e24996bf2e9238.zip
s3:registry: use delete_reg_subkey() in reg_deletekey()
This further speeds up net conf drop. Michael
-rw-r--r--source3/registry/reg_api.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index d84acff7c5..3dc3bae6fe 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -584,21 +584,7 @@ WERROR reg_deletekey(struct registry_key *parent, const char *path)
goto done;
}
- err = fill_subkey_cache(parent);
- W_ERROR_NOT_OK_GOTO_DONE(err);
-
- err = regsubkey_ctr_delkey(parent->subkeys, name);
- W_ERROR_NOT_OK_GOTO_DONE(err);
-
- if (!store_reg_keys(parent->key, parent->subkeys)) {
- TALLOC_FREE(parent->subkeys);
- err = WERR_REG_IO_FAILURE;
- goto done;
- }
-
- regkey_set_secdesc(key->key, NULL);
-
- err = WERR_OK;
+ err = delete_reg_subkey(parent->key, name);
done:
TALLOC_FREE(mem_ctx);