s3:registry: use delete_reg_subkey() in reg_deletekey()
authorMichael Adam <obnox@samba.org>
Thu, 26 Feb 2009 01:57:59 +0000 (02:57 +0100)
committerMichael Adam <obnox@samba.org>
Thu, 19 Mar 2009 17:04:01 +0000 (18:04 +0100)
This further speeds up net conf drop.

Michael

Signed-off-by: Michael Adam <obnox@samba.org>
source/registry/reg_api.c

index 62f4ae21578e247dd38d7e97f1956d7a4c9ae2fb..a3852cd19d4db0ee4391ffa70e8250de17cf7375 100644 (file)
@@ -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);