]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
director: Fix ring sync wait after DIRECTOR-REMOVE
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Thu, 14 Sep 2017 15:13:05 +0000 (18:13 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 15 Sep 2017 09:00:36 +0000 (12:00 +0300)
It was sending OK twice, and the first OK was too early.

src/director/doveadm-connection.c

index 1e51ede247b5f1cd07a1f5ea2d048e16dd85247e..5850752b2259c80998a0eea1c85ed69e81f3ce1e 100644 (file)
@@ -285,10 +285,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;
 }