From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 5 Jun 2016 13:40:27 +0000 (+0300)
Subject: director: Fixed error handling when directors support incompatible tags
X-Git-Tag: 2.3.0.rc1~3550
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=389a9fe1636038527f7a75fb5d38361c90bd676a;p=thirdparty%2Fdovecot%2Fcore.git

director: Fixed error handling when directors support incompatible tags

Connection should have been disconnected immediately, not after the next
command that would have produced "Incompatible protocol".
---

diff --git a/src/director/director-connection.c b/src/director/director-connection.c
index 1ad6e02f42..d8b58d3c56 100644
--- a/src/director/director-connection.c
+++ b/src/director/director-connection.c
@@ -1239,7 +1239,7 @@ director_connection_handle_handshake(struct director_connection *conn,
 		if (conn->minor_version < DIRECTOR_VERSION_TAGS_V2 &&
 		    mail_hosts_have_tags(conn->dir->mail_hosts)) {
 			i_error("director(%s): Director version supports incompatible tags", conn->name);
-			return FALSE;
+			return -1;
 		}
 		conn->version_received = TRUE;
 		if (conn->done_pending) {