From: Timo Sirainen <tss@iki.fi>
Date: Tue, 25 Aug 2015 15:32:23 +0000 (+0300)
Subject: imap: Fail silently if selected mailbox format doesn't support GUIDs.
X-Git-Tag: 2.2.19.rc1~186
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3fa33be556fd5199dcc856b02b58128bdf693a5;p=thirdparty%2Fdovecot%2Fcore.git

imap: Fail silently if selected mailbox format doesn't support GUIDs.
---

diff --git a/src/imap/imap-state.c b/src/imap/imap-state.c
index 07b9abb044..a7e93be613 100644
--- a/src/imap/imap-state.c
+++ b/src/imap/imap-state.c
@@ -213,6 +213,7 @@ imap_state_export_mailbox(buffer_t *dest, struct client *client,
         struct mailbox_status status;
 	struct mailbox_metadata metadata;
 	const char *vname = mailbox_get_vname(box);
+	enum mail_error mail_error;
 
 	mailbox_get_open_status(box, STATUS_UIDVALIDITY | STATUS_UIDNEXT |
 				STATUS_MESSAGES | STATUS_HIGHESTMODSEQ |
@@ -224,8 +225,9 @@ imap_state_export_mailbox(buffer_t *dest, struct client *client,
 	}
 
 	if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID, &metadata) < 0) {
-		*error_r = mailbox_get_last_error(box, NULL);
-		return -1;
+		*error_r = mailbox_get_last_error(box, &mail_error);
+		/* if the selected mailbox can't have a GUID, fail silently */
+		return mail_error == MAIL_ERROR_NOTPOSSIBLE ? 0 : -1;
 	}
 
 	buffer_append_c(dest, IMAP_STATE_TYPE_MAILBOX);