On Wed, Apr 02, 2008 at 09:51:50PM +1100, Bron Gondwana wrote:
> On Wed, Apr 02, 2008 at 11:28:07AM +1030, Stephen Carr wrote:
> > I get the following type of error (see below) during replication that
> > appeared after upgrading from 2.3.8 to 2.3.11.
>
> BAH - upload_messages_from() is broken.
>
> Will reply shortly with a patch,
Ken - CCing you on this one since you'll want this for CVS.
I have compile tested this - haven't rolled it out anywhere,
but it's pretty trivial.
Regards,
Bron.
Index: cyrus-imapd-2.3.11/imap/sync_client.c
===================================================================
--- cyrus-imapd-2.3.11.orig/imap/sync_client.c 2008-04-02 10:56:52.000000000 +0000
+++ cyrus-imapd-2.3.11/imap/sync_client.c 2008-04-02 10:57:56.000000000 +0000
@@ -1358,7 +1358,7 @@ static int upload_messages_list(struct m
struct sync_index_list *index_list;
unsigned max_count = config_getint(IMAPOPT_SYNC_BATCH_SIZE);
- if (max_count <= 0) max_count = INT_MAX;
+ if (!max_count) max_count = INT_MAX;
if (chdir(mailbox->path)) {
syslog(LOG_ERR, "Couldn't chdir to %s: %s",
@@ -1432,6 +1432,8 @@ static int upload_messages_from(struct m
struct sync_index_list *index_list;
unsigned max_count = config_getint(IMAPOPT_SYNC_BATCH_SIZE);
+ if (!max_count) max_count = INT_MAX;
+
if (chdir(mailbox->path)) {
syslog(LOG_ERR, "Couldn't chdir to %s: %s",
mailbox->path, strerror(errno));
----
Cyrus Home Page: http://cyrusimap.web.cmu.edu/
Cyrus Wiki/FAQ: http://cyrusimap.web.cmu.edu/twiki
List Archives/Info: http://asg.web.cmu.edu/cyrus/mailing-list.html
