summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2007-02-08 15:16:19 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2007-02-08 15:16:19 +0000
commit4311097ecf0db28101920522340c59469582529e (patch)
tree1c8636a5d16e7e0ea4fb9209389bdbc2e33fdcea /src
parent7c5214ecc29b8fc23e15030db8207e3ff2cb4fc6 (diff)
Fix bad outgoing_port in log line for delivery of a re-used connection.
Diffstat (limited to 'src')
-rw-r--r--src/src/transports/smtp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 509ff1949..2fce7bab2 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.35 2007/02/06 14:49:13 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/smtp.c,v 1.36 2007/02/08 15:16:19 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -917,7 +917,8 @@ if (continue_hostname == NULL)
{
inblock.sock = outblock.sock =
smtp_connect(host, host_af, port, interface, ob->connect_timeout,
- ob->keepalive);
+ ob->keepalive); /* This puts port into host->port */
+
if (inblock.sock < 0)
{
set_errno(addrlist, (errno == ETIMEDOUT)? ERRNO_CONNECTTIMEOUT : errno,
@@ -1041,6 +1042,7 @@ else
{
inblock.sock = outblock.sock = fileno(stdin);
smtp_command = big_buffer;
+ host->port = port; /* Record the port that was used */
}
/* If TLS is available on this connection, whether continued or not, attempt to