From: Timo Sirainen <tss@iki.fi>
Date: Mon, 28 Apr 2014 21:53:01 +0000 (+0300)
Subject: dsync: Yet another fix to working with old versions.
X-Git-Tag: 2.2.13.rc1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4eaea7f7e8e41eb80efa5838d82ae7c1384f72;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Yet another fix to working with old versions.
---

diff --git a/src/doveadm/dsync/dsync-ibc-stream.c b/src/doveadm/dsync/dsync-ibc-stream.c
index 5a4472b0fe..65252d1681 100644
--- a/src/doveadm/dsync/dsync-ibc-stream.c
+++ b/src/doveadm/dsync/dsync-ibc-stream.c
@@ -850,8 +850,8 @@ dsync_ibc_stream_recv_mailbox_state(struct dsync_ibc *_ibc,
 		dsync_ibc_input_error(ibc, decoder, "Invalid last_common_pvt_modseq");
 		return DSYNC_IBC_RECV_RET_TRYAGAIN;
 	}
-	value = dsync_deserializer_decode_get(decoder, "last_messages_count");
-	if (str_to_uint32(value, &state_r->last_messages_count) < 0) {
+	if (dsync_deserializer_decode_try(decoder, "last_messages_count", &value) &&
+	    str_to_uint32(value, &state_r->last_messages_count) < 0) {
 		dsync_ibc_input_error(ibc, decoder, "Invalid last_messages_count");
 		return DSYNC_IBC_RECV_RET_TRYAGAIN;
 	}