git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
659b516
)
Merge ssh://tahini.csx.cam.ac.uk/home/git/exim
author
John Jetmore
<jetmore@exim.org>
Tue, 20 Jul 2010 02:18:51 +0000
(21:18 -0500)
committer
John Jetmore
<jetmore@exim.org>
Tue, 20 Jul 2010 02:18:51 +0000
(21:18 -0500)
src/src/transports/smtp.c
patch
|
blob
|
history
diff --git
a/src/src/transports/smtp.c
b/src/src/transports/smtp.c
index fb55ae01bbd7210962e5be0f5ed778faa1329779..41796a4d9d5d9d869a23748ea81afc189ac416cd 100644
(file)
--- 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. */