diff options
| author | Michael Adam <obnox@samba.org> | 2009-02-25 09:53:16 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2009-02-26 13:22:54 +0100 |
| commit | 0b22f8b99c0291f2e45166124358844127fb8edf (patch) | |
| tree | 9a933077726a05b1c69fd0c178639e3a1307139e /source3/registry/reg_api.c | |
| parent | 149d94dd8f5513af9f75d568507c880c63b9187e (diff) | |
| download | samba-0b22f8b99c0291f2e45166124358844127fb8edf.tar.gz samba-0b22f8b99c0291f2e45166124358844127fb8edf.tar.bz2 samba-0b22f8b99c0291f2e45166124358844127fb8edf.zip | |
s3:registry: hash the list of subkeys in the regsubkey_ctr
This removes many loops over all the arrays
(from regsubkey_ctr_key_exists) and thus
reduces "net conf drop" from 1m55 to 48seconds
and "net conf import" from 1m55 to 58 seconds
for 2000 shares on my box.
Michael
Diffstat (limited to 'source3/registry/reg_api.c')
| -rw-r--r-- | source3/registry/reg_api.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 66296f0ddd..7185b1a312 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -552,7 +552,6 @@ WERROR reg_deletekey(struct registry_key *parent, const char *path) WERROR err; TALLOC_CTX *mem_ctx; char *name, *end; - int num_subkeys; struct registry_key *tmp_key, *key; if (!(mem_ctx = talloc_init("reg_createkey"))) return WERR_NOMEM; @@ -598,10 +597,8 @@ WERROR reg_deletekey(struct registry_key *parent, const char *path) goto error; } - num_subkeys = regsubkey_ctr_numkeys(parent->subkeys); - - if (regsubkey_ctr_delkey(parent->subkeys, name) == num_subkeys) { - err = WERR_BADFILE; + err = regsubkey_ctr_delkey(parent->subkeys, name); + if (!W_ERROR_IS_OK(err)) { goto error; } @@ -1151,6 +1148,9 @@ static WERROR reg_deletekey_recursive_trans(TALLOC_CTX *ctx, werr = reg_deletekey_recursive_internal(ctx, parent, path, del_key); if (!W_ERROR_IS_OK(werr)) { + DEBUG(1, (__location__ " failed to delete key '%s' from key " + "'%s': %s\n", path, parent->key->name, + win_errstr(werr))); werr = regdb_transaction_cancel(); if (!W_ERROR_IS_OK(werr)) { DEBUG(0, ("reg_deletekey_recursive_trans: " |