From: Timo Sirainen <tss@iki.fi>
Date: Wed, 29 Aug 2012 15:34:43 +0000 (+0300)
Subject: imap: Send BAD replies with client_send_command_error()
X-Git-Tag: 2.2.alpha1~267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce85eb246b9f2d1cd332c3da886bfbdb5392d3fc;p=thirdparty%2Fdovecot%2Fcore.git

imap: Send BAD replies with client_send_command_error()
---

diff --git a/src/imap/cmd-cancelupdate.c b/src/imap/cmd-cancelupdate.c
index 93e36ed7c4..55d9c2ab68 100644
--- a/src/imap/cmd-cancelupdate.c
+++ b/src/imap/cmd-cancelupdate.c
@@ -29,13 +29,13 @@ bool cmd_cancelupdate(struct client_command_context *cmd)
 
 	for (i = 0; args[i].type == IMAP_ARG_STRING; i++) ;
 	if (!IMAP_ARG_IS_EOL(&args[i]) || i == 0) {
-		client_send_tagline(cmd, "BAD Invalid parameters.");
+		client_send_command_error(cmd, "Invalid parameters.");
 		return TRUE;
 	}
 
 	while (imap_arg_get_quoted(args, &tag)) {
 		if (!client_search_update_cancel(cmd->client, tag)) {
-			client_send_tagline(cmd, "BAD Unknown tag.");
+			client_send_tagline(cmd, "NO Unknown tag.");
 			return TRUE;
 		}
 		args++;
diff --git a/src/imap/cmd-uid.c b/src/imap/cmd-uid.c
index 3e93345901..063a8776fe 100644
--- a/src/imap/cmd-uid.c
+++ b/src/imap/cmd-uid.c
@@ -15,8 +15,8 @@ bool cmd_uid(struct client_command_context *cmd)
 
 	command = command_find(t_strconcat("UID ", cmd_name, NULL));
 	if (command == NULL) {
-		client_send_tagline(cmd, t_strconcat(
-			"BAD Unknown UID command ", cmd_name, NULL));
+		client_send_command_error(cmd, t_strconcat(
+			"Unknown UID command ", cmd_name, NULL));
 		return TRUE;
 	}
 
diff --git a/src/imap/imap-commands-util.c b/src/imap/imap-commands-util.c
index 760ad39b3f..1a22f5b1b8 100644
--- a/src/imap/imap-commands-util.c
+++ b/src/imap/imap-commands-util.c
@@ -218,9 +218,8 @@ bool client_parse_mail_flags(struct client_command_context *cmd,
 			if (flag != 0 && flag != MAIL_RECENT)
 				*flags_r |= flag;
 			else {
-				client_send_tagline(cmd, t_strconcat(
-					"BAD Invalid system flag ",
-					atom, NULL));
+				client_send_command_error(cmd, t_strconcat(
+					"Invalid system flag ", atom, NULL));
 				return FALSE;
 			}
 		} else {
diff --git a/src/imap/imap-status.c b/src/imap/imap-status.c
index b7061038c4..e83a31e64a 100644
--- a/src/imap/imap-status.c
+++ b/src/imap/imap-status.c
@@ -46,8 +46,8 @@ int imap_status_parse_items(struct client_command_context *cmd,
 		else if (strcmp(item, "X-GUID") == 0)
 			metadata |= MAILBOX_METADATA_GUID;
 		else {
-			client_send_tagline(cmd, t_strconcat(
-				"BAD Invalid status item ", item, NULL));
+			client_send_command_error(cmd, t_strconcat(
+				"Invalid status item ", item, NULL));
 			return -1;
 		}
 	}