[dovecot-cvs] dovecot/src/lib-index mail-index-open.c,1.47,1.48

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index
In directory danu:/tmp/cvs-serv19583

Modified Files:
	mail-index-open.c 
Log Message:
Fixed potential file descriptor leaks



Index: mail-index-open.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-open.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- mail-index-open.c	24 Aug 2003 07:06:06 -0000	1.47
+++ mail-index-open.c	23 Sep 2003 13:41:31 -0000	1.48
@@ -346,18 +346,8 @@
 		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;