diff options
| author | Tom Kistner <tom@tahini.csx.cam.ac.uk> | 2011-02-14 19:24:00 +0000 |
|---|---|---|
| committer | Tom Kistner <tom@tahini.csx.cam.ac.uk> | 2011-02-14 19:24:00 +0000 |
| commit | 0dda43406a4b207504213c58f668de9354ea915e (patch) | |
| tree | 5074e095ab95cff0abc1e9f083a4858adbb3bc13 | |
| parent | 4d805ee9e5f51ced162cf23bd59878aa6dd831bf (diff) | |
BugZilla 1006 - recommit patch from Micha Lenk
| -rw-r--r-- | 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 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. */ |