From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 8 Nov 2017 12:32:25 +0000 (+0200)
Subject: doveadm: client - Cleanup: Don't check authenticate_sent twice
X-Git-Tag: 2.3.0.rc1~454
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd91d0e92ee8b5f8119019eb277d323528f4e031;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: client - Cleanup: Don't check authenticate_sent twice
---

diff --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c
index 54c6c425ba..90d01c3d7b 100644
--- a/src/doveadm/server-connection.c
+++ b/src/doveadm/server-connection.c
@@ -376,16 +376,16 @@ static void server_connection_input(struct server_connection *conn)
 				server_connection_authenticated(conn);
 				break;
 			} else if (strcmp(line, "-") == 0) {
-				if (!conn->authenticate_sent &&
-				    server_connection_authenticate(conn) < 0) {
-					server_connection_destroy(&conn);
-					return;
-				} else if (conn->authenticate_sent) {
+				if (conn->authenticate_sent) {
 					i_error("doveadm authentication failed (%s)",
 						line+1);
 					server_connection_destroy(&conn);
 					return;
 				}
+				if (server_connection_authenticate(conn) < 0) {
+					server_connection_destroy(&conn);
+					return;
+				}
 			} else {
 				i_error("doveadm server sent invalid handshake: %s",
 					line);