From: Michael Adam <obnox@samba.org>
Date: Thu, 26 Feb 2009 01:57:59 +0000 (+0100)
Subject: s3:registry: use delete_reg_subkey() in reg_deletekey()
X-Git-Tag: samba-3.4.0pre1~697
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=270ab5544b9e2a26e00ccb4e27e24996bf2e9238

s3:registry: use delete_reg_subkey() in reg_deletekey()

This further speeds up net conf drop.

Michael
---

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index d84acff7c59..3dc3bae6feb 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);