Mercurial > dovecot > core-2.2

diff src/lmtp/lmtp-proxy.c @ 15005:1f95d4fe29c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes from v2.1 tree.
author Timo Sirainen <tss@iki.fi>
date Thu, 30 Aug 2012 22:05:02 +0300
parents 6d2a439a10a6 bde62f77c65a
children 1b46c1bf9d1e
line wrap: on
line diff
--- a/src/lmtp/lmtp-proxy.c	Thu Aug 30 21:12:23 2012 +0300
+++ b/src/lmtp/lmtp-proxy.c	Thu Aug 30 22:05:02 2012 +0300
@@ -70,6 +70,7 @@
 	proxy->set.my_hostname = p_strdup(pool, set->my_hostname);
 	proxy->set.dns_client_socket_path =
 		p_strdup(pool, set->dns_client_socket_path);
+	proxy->set.session_id = p_strdup(pool, set->session_id);
 	proxy->set.source_ip = set->source_ip;
 	proxy->set.source_port = set->source_port;
 	proxy->set.proxy_ttl = set->proxy_ttl;
@@ -272,8 +273,9 @@
 	const char *line;
 
 	line = t_strdup_printf(ERRSTR_TEMP_REMOTE_FAILURE
-			       " (timeout while waiting for reply to %s)",
-			       lmtp_client_state_to_string(conn->client));
+			       " (timeout while waiting for reply to %s) <%s>",
+			       lmtp_client_state_to_string(conn->client),
+			       conn->proxy->set.session_id);
 	lmtp_client_fail(conn->client, line);
 }