From: Michael Adam <obnox@samba.org>
Date: Sun, 13 Apr 2008 13:41:07 +0000 (+0200)
Subject: registry: honour the WERROR that regsubkey_ctr_addkey gives in regdb_fetch_keys.
X-Git-Tag: samba-3.3.0pre1~2696
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dd7471da7eca2671b4aa62e8790973e3ff14177;p=thirdparty%2Fsamba.git

registry: honour the WERROR that regsubkey_ctr_addkey gives in regdb_fetch_keys.

Michael
---

diff --git a/source/registry/reg_backend_db.c b/source/registry/reg_backend_db.c
index 31a8f776149..bd28eb32413 100644
--- a/source/registry/reg_backend_db.c
+++ b/source/registry/reg_backend_db.c
@@ -720,6 +720,7 @@ fail:
 
 int regdb_fetch_keys(const char *key, REGSUBKEY_CTR *ctr)
 {
+	WERROR werr;
 	char *path = NULL;
 	uint32 num_items;
 	uint8 *buf;
@@ -764,7 +765,12 @@ int regdb_fetch_keys(const char *key, REGSUBKEY_CTR *ctr)
 
 	for (i=0; i<num_items; i++) {
 		len += tdb_unpack(buf+len, buflen-len, "f", subkeyname);
-		regsubkey_ctr_addkey(ctr, subkeyname);
+		werr = regsubkey_ctr_addkey(ctr, subkeyname);
+		if (!W_ERROR_IS_OK(werr)) {
+			DEBUG(5, ("regdb_fetch_keys: regsubkey_ctr_addkey "
+				  "failed: %s\n", dos_errstr(werr)));
+			goto fail;
+		}
 	}
 
 	DEBUG(11,("regdb_fetch_keys: Exit [%d] items\n", num_items));