summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-13 15:45:33 +0200
committerMichael Adam <obnox@samba.org>2008-04-13 15:45:33 +0200
commit282c9ff8ae0cdb472bd8c76822c83fe900d75e59 (patch)
treea44595030340b41c122f3efd00aad2c093f56a9b
parent86d189dad1e8d833974522ad86fd5b7317542c4a (diff)
downloadsamba-282c9ff8ae0cdb472bd8c76822c83fe900d75e59.tar.gz
samba-282c9ff8ae0cdb472bd8c76822c83fe900d75e59.tar.bz2
samba-282c9ff8ae0cdb472bd8c76822c83fe900d75e59.zip
registry: honour the WERROR that regsubkey_ctr_addkey gives us in reg_load_tree.
Michael (This used to be commit c2d9baa29edb2356f32ca19aea828184e9ac7b93)
-rw-r--r--source3/registry/reg_api.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index cbbc7dd0ef..e9a7145255 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -771,7 +771,11 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
key->subkey_index = 0;
while ((subkey = regfio_fetch_subkey( regfile, key ))) {
- regsubkey_ctr_addkey(subkeys, subkey->keyname);
+ result = regsubkey_ctr_addkey(subkeys, subkey->keyname);
+ if (!W_ERROR_IS_OK(result)) {
+ TALLOC_FREE(subkeys);
+ return result;
+ }
}
/* write this key and values out */