From: Timo Sirainen <tss@iki.fi>
Date: Sun, 16 May 2004 01:37:32 +0000 (+0300)
Subject: fix
X-Git-Tag: 1.1.alpha1~4087
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d0f2732dd6145ff0ec7534655d81884d1d77f9d;p=thirdparty%2Fdovecot%2Fcore.git

fix

--HG--
branch : HEAD
---

diff --git a/src/pop3/client.c b/src/pop3/client.c
index 6ac06372b3..1389d603e1 100644
--- a/src/pop3/client.c
+++ b/src/pop3/client.c
@@ -64,10 +64,9 @@ static int init_mailbox(struct client *client)
 	memset(&search_arg, 0, sizeof(search_arg));
 	search_arg.type = SEARCH_ALL;
 
-	t = mailbox_transaction_begin(client->mailbox, FALSE);
-
 	client->message_sizes = i_new(uoff_t, client->messages_count);
 	for (i = 0; i < 2; i++) {
+		t = mailbox_transaction_begin(client->mailbox, FALSE);
 		ctx = mailbox_search_init(t, NULL, &search_arg, NULL,
 					  MAIL_FETCH_SIZE, NULL);
 		if (ctx == NULL) {
@@ -104,6 +103,7 @@ static int init_mailbox(struct client *client)
 		}
 
 		/* well, sync and try again */
+		mailbox_transaction_rollback(t);
 		if (mailbox_sync(client->mailbox, 0) < 0) {
 			client_send_storage_error(client);
                         mailbox_transaction_rollback(t);