diff options
author | Alexander Bokovoy <ab@altlinux.org> | 2008-01-14 21:40:40 +0300 |
---|---|---|
committer | Alexander Bokovoy <ab@altlinux.org> | 2008-01-14 21:40:40 +0300 |
commit | d7a406eaa78273e0efa0ce71a9ced5f06e537aab (patch) | |
tree | 49f405f43e5297a2f3ea52c633ff1bcecdf282c6 /source3/registry/reg_api.c | |
parent | 978eb313448fe9612db5491385a91dd3b67d0e97 (diff) | |
parent | d35bda0ffd5bea57087dba9a6da8c20df8fa165c (diff) | |
download | samba-d7a406eaa78273e0efa0ce71a9ced5f06e537aab.tar.gz samba-d7a406eaa78273e0efa0ce71a9ced5f06e537aab.tar.bz2 samba-d7a406eaa78273e0efa0ce71a9ced5f06e537aab.zip |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 5c2d4c76d8b56be92edcee026f2289b8b46a4c27)
Diffstat (limited to 'source3/registry/reg_api.c')
-rw-r--r-- | source3/registry/reg_api.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index bb410e646b..8bbdb6abd3 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -27,7 +27,9 @@ static WERROR fill_value_cache(struct registry_key *key) { if (key->values != NULL) { - return WERR_OK; + if (!reg_values_need_update(key->key, key->values)) { + return WERR_OK; + } } if (!(key->values = TALLOC_ZERO_P(key, REGVAL_CTR))) { @@ -44,7 +46,9 @@ static WERROR fill_value_cache(struct registry_key *key) static WERROR fill_subkey_cache(struct registry_key *key) { if (key->subkeys != NULL) { - return WERR_OK; + if (!reg_subkeys_need_update(key->key, key->subkeys)) { + return WERR_OK; + } } if (!(key->subkeys = TALLOC_ZERO_P(key, REGSUBKEY_CTR))) { |