lib-imap, imap: BINARY [UNKNOWNCTE] to [PARSE]

dovecot · May 3, 2016 · ff17313 · ff17313
1 parent 38a985c
commit ff17313
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/imap/cmd-fetch.c b/src/imap/cmd-fetch.c
@@ -209,12 +209,14 @@ static bool cmd_fetch_finish(struct imap_fetch_context *ctx,
 		}
 
 		errstr = mailbox_get_last_error(cmd->client->mailbox, &error);
-		if (error == MAIL_ERROR_CONVERSION ||
-		    error == MAIL_ERROR_INVALIDDATA) {
-			/* a) BINARY found unsupported Content-Transfer-Encoding
-			   b) Content was invalid */
+		if (error == MAIL_ERROR_CONVERSION) {
+			/* BINARY found unsupported Content-Transfer-Encoding */
 			tagged_reply = t_strdup_printf(
 				"NO ["IMAP_RESP_CODE_UNKNOWN_CTE"] %s", errstr);
+		} else if (error == MAIL_ERROR_INVALIDDATA) {
+			/* Content was invalid */
+			tagged_reply = t_strdup_printf(
+				"NO ["IMAP_RESP_CODE_PARSE"] %s", errstr);
 		} else {
 			/* We never want to reply NO to FETCH requests,
 			   BYE is preferrable (see imap-ml for reasons). */

diff --git a/src/lib-imap/imap-resp-code.h b/src/lib-imap/imap-resp-code.h
@@ -22,4 +22,7 @@
 
 #define IMAP_RESP_CODE_UNKNOWN_CTE "UNKNOWN-CTE" /* BINARY */
 
+/* IMAP standard (RFC 3501) */
+#define IMAP_RESP_CODE_PARSE "PARSE"
+
 #endif