diff options
author | Gerald (Jerry) Carter <jerry@samba.org> | 2008-01-14 15:10:14 -0600 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2008-01-14 15:10:14 -0600 |
commit | 9a50c929ba0de8c0d1f7fc515cc6b3d954a6c9d7 (patch) | |
tree | bfe689a52df86b727fe29cc59d8ef30b21ca8d3b /source3/registry/reg_api.c | |
parent | 582bd8071f168190e0cf1f6d1637f79ebee287c3 (diff) | |
parent | edd4cb0373a668c422b3aa2a460c1004682f3d1d (diff) | |
download | samba-9a50c929ba0de8c0d1f7fc515cc6b3d954a6c9d7.tar.gz samba-9a50c929ba0de8c0d1f7fc515cc6b3d954a6c9d7.tar.bz2 samba-9a50c929ba0de8c0d1f7fc515cc6b3d954a6c9d7.zip |
Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit bb36b74a4e8fa63672031145b6d39d79468241d9)
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))) { |