From ac4c41f00814a6c91d7fb440e2e3339f14ffd638 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Sat, 8 Dec 2018 18:58:49 -0700 Subject: * Alpine would not report an error correctly in the case that there was a failure using an SMTP server. This was due to c-client sending a RSET command after the failure and Alpine reporting the reply of this command. --- imap/src/c-client/smtp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'imap/src') diff --git a/imap/src/c-client/smtp.c b/imap/src/c-client/smtp.c index 405f8738..d6b46a56 100644 --- a/imap/src/c-client/smtp.c +++ b/imap/src/c-client/smtp.c @@ -1,5 +1,5 @@ /* ======================================================================== - * Copyright 2015 Eduardo Chappa + * Copyright 2015-2018 Eduardo Chappa * Copyright 2008 Mark Crispin * ======================================================================== */ @@ -11,7 +11,7 @@ * * Date: 27 July 1988 * Last Edited: 19 November 2008 (Crispin) - * Last Edited: 16 January 2015 (Chappa) + * Last Edited: 8 December 2018 (Chappa) * * Previous versions of this file were * @@ -486,7 +486,12 @@ long smtp_mail (SENDSTREAM *stream,char *type,ENVELOPE *env,BODY *body) case SMTPOK: /* looks good */ break; default: /* other failure */ - smtp_send (stream,"RSET",NIL); + /* Do not RSET connection at this time, or else client + * will not see failure, and will see the reply to a + * RSET command, which is typically success, and not the + * error that made us come here, in the first place. + * smtp_send (stream,"RSET",NIL); + */ return NIL; } /* negotiate the recipients */ -- cgit v1.2.3-70-g09d2