diff options
| author | Tom Kistner <tom@duncanthrax.net> | 2010-07-19 11:47:27 +0200 |
|---|---|---|
| committer | Tom Kistner <tom@duncanthrax.net> | 2010-07-19 11:47:27 +0200 |
| commit | d41e4a9122eb42ec4fdc3bc6cc2a5094d0e515f1 (patch) | |
| tree | 7cf3bc3ed587859e4bc1df848f811e7d922ed1a0 | |
| parent | a56f166d182394d5e339bb50bc1725a3f98c768a (diff) | |
Bugzilla #1006: Keep EHLO attributes in case STARTTLS errors are ignored
Applied patch submitted by Micha Lenk. Thanks!
| -rw-r--r-- | src/src/transports/smtp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index fb55ae01b..41796a4d9 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1078,10 +1078,12 @@ if (tls_offered && !suppress_tls && if (!smtp_read_response(&inblock, buffer2, sizeof(buffer2), '2', ob->command_timeout)) { - Ustrncpy(buffer, buffer2, sizeof(buffer)); if (errno != 0 || buffer2[0] == 0 || (buffer2[0] == '4' && !ob->tls_tempfail_tryclear)) + { + Ustrncpy(buffer, buffer2, sizeof(buffer)); goto RESPONSE_FAILED; + } } /* STARTTLS accepted: try to negotiate a TLS session. */ |