From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 31 May 2017 10:15:04 +0000 (+0300)
Subject: director: Fix "sending handshake timed out" error to be actually logged
X-Git-Tag: 2.2.31.rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d621f5935539dcfcb29f261a67a62c96c38ca11;p=thirdparty%2Fdovecot%2Fcore.git

director: Fix "sending handshake timed out" error to be actually logged

io was never NULL here, so it was never logged.
---

diff --git a/src/director/director-connection.c b/src/director/director-connection.c
index 9b631d658a..e99b17fe6a 100644
--- a/src/director/director-connection.c
+++ b/src/director/director-connection.c
@@ -166,12 +166,12 @@ director_connection_init_timeout(struct director_connection *conn)
 	if (!conn->connected) {
 		i_error("director(%s): Connect timed out (%u secs)",
 			conn->name, secs);
-	} else if (conn->io == NULL) {
-		i_error("director(%s): Sending handshake (%u secs)",
-			conn->name, secs);
 	} else if (!conn->me_received) {
 		i_error("director(%s): Handshaking ME timed out (%u secs)",
 			conn->name, secs);
+	} else if (!conn->in) {
+		i_error("director(%s): Sending handshake timed out (%u secs)",
+			conn->name, secs);
 	} else {
 		i_error("director(%s): Handshaking DONE timed out (%u secs)",
 			conn->name, secs);