[exim-dev] [Bug 1006] SMTP transport looses received EHLO a…

Top Page
Delete this message
Reply to this message
Author: Git Commit
Date:  
To: exim-dev
Old-Topics: [exim-dev] [Bug 1006] New: SMTP transport looses received EHLO attributes when STARTTLS fails
Subject: [exim-dev] [Bug 1006] SMTP transport looses received EHLO attributes when STARTTLS fails
------- You are receiving this mail because: -------
You are on the CC list for the bug.

http://bugs.exim.org/show_bug.cgi?id=1006

Git Commit <git@???> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |git@???





--- Comment #6 from Git Commit <git@???> 2011-02-14 20:17:05 ---
Git commit:
http://git.exim.org/exim.git/commitdiff/0dda43406a4b207504213c58f668de9354ea915e

commit 0dda43406a4b207504213c58f668de9354ea915e
Author:     Tom Kistner <tom@???>
AuthorDate: Mon Feb 14 19:24:00 2011 +0000
Commit:     Tom Kistner <tom@???>
CommitDate: Mon Feb 14 19:24:00 2011 +0000


    BugZilla 1006 - recommit patch from Micha Lenk
---
 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 e06631f..548fbfc 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. */


--
Configure bugmail: http://bugs.exim.org/userprefs.cgi?tab=email