From 052ddc9cd0c1141104477ebd6c69320485b6315a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 8 Jul 2007 22:01:43 +0000 Subject: r23751: Call tdb_close even when validation was not successful. Michael (This used to be commit b68856d9902f41079224ba11c7d0ab811b082201) --- source3/lib/util_tdb.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c index 38b9285719..5f9a5115b6 100644 --- a/source3/lib/util_tdb.c +++ b/source3/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")); -- cgit