Gitweb:
http://git.exim.org/exim.git/commitdiff/0dda43406a4b207504213c58f668de9354ea915e
Commit: 0dda43406a4b207504213c58f668de9354ea915e
Parent: 4d805ee9e5f51ced162cf23bd59878aa6dd831bf
Author: Tom Kistner <tom@???>
AuthorDate: Mon Feb 14 19:24:00 2011 +0000
Committer: 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. */