From: Tom Kistner <tom@duncanthrax.net>
Date: Mon, 19 Jul 2010 09:47:27 +0000 (+0200)
Subject: Bugzilla #1006: Keep EHLO attributes in case STARTTLS errors are ignored
X-Git-Tag: exim-4_73_RC0~22^2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d41e4a9122eb42ec4fdc3bc6cc2a5094d0e515f1;p=exim.git

Bugzilla #1006: Keep EHLO attributes in case STARTTLS errors are ignored

Applied patch submitted by Micha Lenk. Thanks!
---

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. */