From: Timo Sirainen <tss@iki.fi>
Date: Tue, 23 Sep 2003 13:41:31 +0000 (+0300)
Subject: Fixed potential file descriptor leaks
X-Git-Tag: 1.1.alpha1~4317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f67f7671d28a500154f0ba548f6def9d6b16c3;p=thirdparty%2Fdovecot%2Fcore.git

Fixed potential file descriptor leaks

--HG--
branch : HEAD
---

diff --git a/src/lib-index/mail-index-open.c b/src/lib-index/mail-index-open.c
index de946d76b7..f66b67e81b 100644
--- a/src/lib-index/mail-index-open.c
+++ b/src/lib-index/mail-index-open.c
@@ -346,18 +346,8 @@ static int mail_index_open_index(struct mail_index *index,
 		index->lock_type = MAIL_LOCK_UNLOCK;
 	}
 
-	if (!index_open_and_fix(index, flags)) {
-		if ((index->set_flags & MAIL_INDEX_HDR_FLAG_REBUILD) == 0 ||
-		    (flags & _MAIL_INDEX_OPEN_FLAG_CREATING) != 0)
-			return FALSE;
-
-		/* needs a rebuild */
-		if (!index->set_lock(index, MAIL_LOCK_UNLOCK))
-			return FALSE;
-
-		flags |= _MAIL_INDEX_OPEN_FLAG_CREATING;
-		return mail_index_open_index(index, flags);
-	}
+	if (!index_open_and_fix(index, flags))
+		return FALSE;
 
 	if (!index->set_lock(index, MAIL_LOCK_UNLOCK))
 		return FALSE;