From: Michael Adam <obnox@samba.org>
Date: Sun, 8 Jul 2007 22:01:43 +0000 (+0000)
Subject: r23751: Call tdb_close even when validation was not successful.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b68856d9902f41079224ba11c7d0ab811b082201;p=thirdparty%2Fsamba.git

r23751: Call tdb_close even when validation was not successful.

Michael
---

diff --git a/source/lib/util_tdb.c b/source/lib/util_tdb.c
index 38b92857195..5f9a5115b6b 100644
--- a/source/lib/util_tdb.c
+++ b/source/lib/util_tdb.c
@@ -994,7 +994,6 @@ static int tdb_validate_child(const char *tdb_path,
 			      int pfd)
 {
 	int ret = -1;
-	int tfd = -1;
 	int num_entries = 0;
 	TDB_CONTEXT *tdb = NULL;
 	struct tdb_validation_status v_status;
@@ -1012,8 +1011,6 @@ static int tdb_validate_child(const char *tdb_path,
 		goto out;
 	}
 
-	tfd = tdb_fd(tdb);
-
 	/* Check the cache freelist is good. */
 	if (tdb_validate_freelist(tdb, &num_entries) == -1) {
 		DEBUG(0,("tdb_validate_child: bad freelist in cache %s\n",
@@ -1048,12 +1045,7 @@ static int tdb_validate_child(const char *tdb_path,
 
 out:
 	if (tdb) {
-		if (ret == 0) {
-			tdb_close(tdb);
-		}
-		else if (tfd != -1) {
-			close(tfd);
-		}
+		tdb_close(tdb);
 	}
 
 	DEBUG(10, ("tdb_validate_child: writing status to pipe\n"));