From 282c9ff8ae0cdb472bd8c76822c83fe900d75e59 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 13 Apr 2008 15:45:33 +0200
Subject: registry: honour the WERROR that regsubkey_ctr_addkey gives us in
 reg_load_tree.

Michael
(This used to be commit c2d9baa29edb2356f32ca19aea828184e9ac7b93)
---
 source3/registry/reg_api.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source3')

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 */
-- 
cgit