dovecot-2.2: imap: Send BAD replies with client_send_command_err...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3f83a27a72b8
changeset: 14973:3f83a27a72b8
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Aug 29 18:34:43 2012 +0300
description:
imap: Send BAD replies with client_send_command_error()

diffstat:

 src/imap/cmd-cancelupdate.c   |  4 ++--
 src/imap/cmd-uid.c            |  4 ++--
 src/imap/imap-commands-util.c |  5 ++---
 src/imap/imap-status.c        |  4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 20ad509a559a -r 3f83a27a72b8 src/imap/cmd-cancelupdate.c
--- a/src/imap/cmd-cancelupdate.c	Wed Aug 29 18:32:13 2012 +0300
+++ b/src/imap/cmd-cancelupdate.c	Wed Aug 29 18:34:43 2012 +0300
@@ -29,13 +29,13 @@
 
 	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 -r 20ad509a559a -r 3f83a27a72b8 src/imap/cmd-uid.c
--- a/src/imap/cmd-uid.c	Wed Aug 29 18:32:13 2012 +0300
+++ b/src/imap/cmd-uid.c	Wed Aug 29 18:34:43 2012 +0300
@@ -15,8 +15,8 @@
 
 	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 -r 20ad509a559a -r 3f83a27a72b8 src/imap/imap-commands-util.c
--- a/src/imap/imap-commands-util.c	Wed Aug 29 18:32:13 2012 +0300
+++ b/src/imap/imap-commands-util.c	Wed Aug 29 18:34:43 2012 +0300
@@ -218,9 +218,8 @@
 			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 -r 20ad509a559a -r 3f83a27a72b8 src/imap/imap-status.c
--- a/src/imap/imap-status.c	Wed Aug 29 18:32:13 2012 +0300
+++ b/src/imap/imap-status.c	Wed Aug 29 18:34:43 2012 +0300
@@ -46,8 +46,8 @@
 		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;
 		}
 	}