Fix bug #2875, "SMTP session disconnects before recieving multi-line

error message".

diff --git a/src/common/smtp.c b/src/common/smtp.c
index a4de8de1f8c5ca6f811a9c4091a27cfa54c8de6a..e540d1fc057d6924b6582ba1cf065248bcbd6ded 100644 (file)
--- a/src/common/smtp.c
+++ b/src/common/smtp.c
@@ -541,6 +541,10 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
                break;
        }
 
+       /* ignore all multiline responses except for EHLO */
+       if (msg[3] == '-' && smtp_session->state != SMTP_EHLO)
+               return session_recv_msg(session);
+
        if (msg[0] == '5' && msg[1] == '0' &&
            (msg[2] == '4' || msg[2] == '3' || msg[2] == '1')) {
                log_warning(LOG_PROTOCOL, _("error occurred on SMTP session\n"));
@@ -578,10 +582,6 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
                return -1;
        }
 
-       /* ignore all multiline responses except for EHLO */
-       if (cont && smtp_session->state != SMTP_EHLO)
-               return session_recv_msg(session);
-
        switch (smtp_session->state) {
        case SMTP_READY:
                if (strstr(msg, "ESMTP"))