From: Tom Kistner <tom@tahini.csx.cam.ac.uk>
Date: Mon, 14 Feb 2011 19:24:00 +0000 (+0000)
Subject: BugZilla 1006 - recommit patch from Micha Lenk
X-Git-Tag: exim-4_75_RC1~8
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0dda43406a4b207504213c58f668de9354ea915e;p=exim.git

BugZilla 1006 - recommit patch from Micha Lenk
---

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index e06631f2f..548fbfc0e 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. */