lib-doveadm: Move starting multiplex into doveadm_client_authenticated()

diff --git a/src/lib-doveadm/doveadm-client.c b/src/lib-doveadm/doveadm-client.c
index f54025d694acca90db9bc14d413eeea227fb5966..b1206a07367187914ff06def59e127efb2bace4d 100644 (file)
--- a/src/lib-doveadm/doveadm-client.c
+++ b/src/lib-doveadm/doveadm-client.c
@@ -339,9 +339,12 @@ static void doveadm_client_start_multiplex(struct doveadm_client *conn)
 static void doveadm_client_authenticated(struct doveadm_client *conn)
 {
        conn->authenticated = TRUE;
+
+       if (conn->conn.minor_version >= DOVEADM_PROTO_MINOR_MIN_MULTIPLEX)
+               doveadm_client_start_multiplex(conn);
+
        if (conn->delayed_cmd != NULL) {
-               doveadm_client_send_cmd(conn, conn->delayed_cmd,
-                                       conn->delayed_cmd_proxy_ttl);
+               o_stream_nsend_str(conn->conn.output, conn->delayed_cmd);
                conn->delayed_cmd = NULL;
                doveadm_client_send_cmd_input(conn);
        }
@@ -386,8 +389,6 @@ static void doveadm_client_input(struct connection *_conn)
                        }
                        conn->conn.version_received = TRUE;
                } else if (strcmp(line, "+") == 0) {
-                       if (conn->conn.minor_version >= DOVEADM_PROTO_MINOR_MIN_MULTIPLEX)
-                               doveadm_client_start_multiplex(conn);
                        doveadm_client_authenticated(conn);
                } else if (strcmp(line, "-") == 0) {
                        if (conn->authenticate_sent) {