summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2005-04-06 15:26:52 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2005-04-06 15:26:52 +0000
commit5ca2a9a1a936ecc55402a1d40b7d8adb74865aba (patch)
tree0fc683e00fde3ee33cf22bc82caa3042e62aebf2 /src
parente4a89c47c2a7d9a9268f36728b4b4f1b028b17b1 (diff)
Fix logging bug when two addresses to the same host list go to different
hosts with different TLS usage within the same delivery process.
Diffstat (limited to 'src')
-rw-r--r--src/src/transports/smtp.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index edcdc409d..91410332d 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transports/smtp.c,v 1.8 2005/03/22 15:45:35 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/smtp.c,v 1.9 2005/04/06 15:26:52 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1020,8 +1020,11 @@ if (tls_offered && !suppress_tls &&
for (addr = addrlist; addr != NULL; addr = addr->next)
{
- addr->cipher = tls_cipher;
- addr->peerdn = tls_peerdn;
+ if (addr->transport_return == PENDING_DEFER)
+ {
+ addr->cipher = tls_cipher;
+ addr->peerdn = tls_peerdn;
+ }
}
}
}