From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 14 Sep 2017 15:13:05 +0000 (+0300)
Subject: director: Fix ring sync wait after DIRECTOR-REMOVE
X-Git-Tag: 2.2.34~320
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=caa79afc75fcba16a2576cedc9762e2a0d88cced;p=thirdparty%2Fdovecot%2Fcore.git

director: Fix ring sync wait after DIRECTOR-REMOVE

It was sending OK twice, and the first OK was too early.
---

diff --git a/src/director/doveadm-connection.c b/src/director/doveadm-connection.c
index 3c2f009409..ae1f163812 100644
--- a/src/director/doveadm-connection.c
+++ b/src/director/doveadm-connection.c
@@ -287,10 +287,8 @@ doveadm_cmd_director_remove(struct doveadm_connection *conn,
 		director_host_lookup_ip(conn->dir, &ip);
 	if (host == NULL)
 		o_stream_nsend_str(conn->output, "NOTFOUND\n");
-	else {
+	else
 		director_ring_remove(host, conn->dir->self_host);
-		o_stream_nsend(conn->output, "OK\n", 3);
-	}
 	return DOVEADM_DIRECTOR_CMD_RET_RING_SYNC_OK;
 }