diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2018-12-08 18:58:49 -0700 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2018-12-08 18:58:49 -0700 |
| commit | ac4c41f00814a6c91d7fb440e2e3339f14ffd638 (patch) | |
| tree | 54de44ce739e0dd51480692db786a1abe1a7e927 | |
| parent | 997ceda29bf9c8e54a10f5c0cec7297b067ad5e7 (diff) | |
| download | alpine-ac4c41f00814a6c91d7fb440e2e3339f14ffd638.tar.xz | |
* 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.
| -rw-r--r-- | imap/src/c-client/smtp.c | 11 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
2 files changed, 9 insertions, 4 deletions
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 */ diff --git a/pith/pine.hlp b/pith/pine.hlp index 3d794087..63bc8d30 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 311 2018-12-06 16:16:12 +Alpine Commit 312 2018-12-08 18:58:41 ============= h_news ================= <HTML> <HEAD> |