From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 21 Nov 2017 14:52:24 +0000 (+0200)
Subject: login-proxy: Log connection errors using IP, not hostname
X-Git-Tag: 2.3.0.rc1~419
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5783df9136dd72c278eae54a14775ddd035b731e;p=thirdparty%2Fdovecot%2Fcore.git

login-proxy: Log connection errors using IP, not hostname

The hostname can point to multiple IPs or there can be some other mismatch.
Logging the IP instead shows exactly what is happening.
---

diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index 4cce5d7533..0d25844bfd 100644
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -184,10 +184,10 @@ proxy_log_connect_error(struct login_proxy *proxy)
 	str_printfa(str, "proxy(%s): ", proxy->client->virtual_user);
 	if (!proxy->connected) {
 		str_printfa(str, "connect(%s, %u) failed: %m",
-			    proxy->host, proxy->port);
+			    net_ip2addr(&proxy->ip), proxy->port);
 	} else {
 		str_printfa(str, "Login for %s:%u timed out in state=%s",
-			    proxy->host, proxy->port,
+			    net_ip2addr(&proxy->ip), proxy->port,
 			    client_proxy_get_state(proxy->client));
 	}
 	str_printfa(str, " (after %u secs",
@@ -303,7 +303,8 @@ static int login_proxy_connect(struct login_proxy *proxy)
 		/* the server is down. fail immediately */
 		client_log_err(proxy->client, t_strdup_printf(
 			"proxy(%s): Host %s:%u is down",
-			proxy->client->virtual_user, proxy->host, proxy->port));
+			proxy->client->virtual_user,
+			net_ip2addr(&proxy->ip), proxy->port));
 		return -1;
 	}
 
@@ -711,7 +712,7 @@ int login_proxy_starttls(struct login_proxy *proxy)
 					&error) < 0) {
 		client_log_err(proxy->client, t_strdup_printf(
 			"proxy: Failed to create SSL client to %s:%u: %s",
-			proxy->host, proxy->port, error));
+			net_ip2addr(&proxy->ip), proxy->port, error));
 		ssl_iostream_context_unref(&ssl_ctx);
 		return -1;
 	}