From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 1 Mar 2019 15:54:48 +0000 (+0100)
Subject: lib-smtp: smtp-client-connection - Retain the host name in the connection label after... 
X-Git-Tag: 2.3.9~716
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95b3b93cd7016fa7e22a8ddf45cbc5512955368e;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: smtp-client-connection - Retain the host name in the connection label after DNS lookup.
---

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index e13333eda0..8887592cae 100644
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -1488,6 +1488,9 @@ static void
 smtp_client_connection_connect_next_ip(struct smtp_client_connection *conn)
 {
 	const struct ip_addr *ip, *my_ip = &conn->set.my_ip;
+	const char *conn_name = (conn->host_is_ip ? NULL :
+				 t_strdup_printf("%s:%u", conn->host,
+						 conn->port));
 
 	timeout_remove(&conn->to_connect);
 
@@ -1503,7 +1506,7 @@ smtp_client_connection_connect_next_ip(struct smtp_client_connection *conn)
 	}
 
 	connection_init_client_ip_from(conn->client->conn_list, &conn->conn,
-				       NULL, ip, conn->port, my_ip);
+				       conn_name, ip, conn->port, my_ip);
 
 	smtp_client_connection_do_connect(conn);
 }