From: Michael Adam <obnox@samba.org>
Date: Tue, 17 Jul 2007 13:06:29 +0000 (+0000)
Subject: r23932: Fill extended status with information in case the validation traverse
X-Git-Tag: samba-4.0.0alpha6~801^2~5323
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc278f2d8f1878b31acedb0271fcf964b4952114;p=thirdparty%2Fsamba.git

r23932: Fill extended status with information in case the validation traverse
functions did not do so but returned an error. (This is the case when
error occurred deeper than at the level of the content checking done by
the per entry validate_fn.)

Michael
(This used to be commit e56be59947a29d0a5692f3f3bc6c089dd8b4b5d9)
---

diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index 7bba22f4bc9..2fa915131bf 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -1021,7 +1021,11 @@ static int tdb_validate_child(const char *tdb_path,
 
 	/* Now traverse the tdb to validate it. */
 	num_entries = tdb_traverse(tdb, validate_fn, (void *)&v_status);
-	if (num_entries == -1 || !(v_status.success)) {
+	if (!v_status.success) {
+		goto out;
+	} else if (num_entries == -1) {
+		v_status.tdb_error = True;
+		v_status.success = False;
 		goto out;
 	}