lib-smtp: smtp-server-cmd-mail - Don't implicitly accept missing '<' and '>' when...

diff --git a/src/lib-smtp/smtp-server-cmd-mail.c b/src/lib-smtp/smtp-server-cmd-mail.c
index 2834a59bbf7e624a16c5d00dc93babd25fe943ca..d21b206b0810b846bcbafaf9ad726eecbca52224 100644 (file)
--- a/src/lib-smtp/smtp-server-cmd-mail.c
+++ b/src/lib-smtp/smtp-server-cmd-mail.c
@@ -107,8 +107,7 @@ void smtp_server_cmd_mail(struct smtp_server_cmd_ctx *cmd,
                SMTP_ADDRESS_PARSE_FLAG_ALLOW_EMPTY |
                SMTP_ADDRESS_PARSE_FLAG_PRESERVE_RAW;
        if (*params != '\0' &&
-           (set->mail_path_allow_broken ||
-            (set->workarounds & SMTP_SERVER_WORKAROUND_MAILBOX_FOR_PATH) != 0))
+           (set->workarounds & SMTP_SERVER_WORKAROUND_MAILBOX_FOR_PATH) != 0)
                path_parse_flags |= SMTP_ADDRESS_PARSE_FLAG_BRACKETS_OPTIONAL;
        if (set->mail_path_allow_broken) {
                path_parse_flags |=

diff --git a/src/lib-smtp/test-smtp-server-errors.c b/src/lib-smtp/test-smtp-server-errors.c
index 60d5ed812704f0585ef10139c80813051cd2f5d9..759c332d8848204c4a67fe67e4acb123b45a35ea 100644 (file)
--- a/src/lib-smtp/test-smtp-server-errors.c
+++ b/src/lib-smtp/test-smtp-server-errors.c
@@ -2046,12 +2046,11 @@ test_mail_broken_path_client_input(struct client_connection *conn)
                        break;
                case 1: /* bad command reply */
                        switch (client_index) {
-                       case 0: case 1: case 2: case 4: case 5:
-                       case 6: case 7: case 8:
+                       case 0: case 1: case 2: case 3: case 4: case 5:
+                       case 6: case 7: case 8: case 11: case 14: case 16:
                                i_assert(reply->status == 501);
                                break;
-                       case 3: case 9: case 10: case 11: case 12: case 13:
-                       case 14: case 15: case 16: case 17:
+                       case 9: case 10: case 12: case 13: case 15: case 17:
                                i_assert(reply->status == 250);
                                break;
                        default: