[Commits] [SCM] claws branch, master, updated. 3.9.3-9-g597f1d7

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  597f1d7f55b064b65f7bbe6823a4cbf6698a9a3c (commit)
      from  6a4badf693d075f151638f9497fa6b467e4d27b3 (commit)


- Log -----------------------------------------------------------------
commit 597f1d7f55b064b65f7bbe6823a4cbf6698a9a3c
Author: Colin Leroy <colin at colino.net>
Date:   Sat Dec 28 19:16:37 2013 +0100

    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 a4de8de..e540d1f 100644
--- 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"))

-----------------------------------------------------------------------

Summary of changes:
 src/common/smtp.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Claws Mail