]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
anvil: Move add_conn_guid to struct anvil_cmd_kick
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 21 Feb 2022 16:09:30 +0000 (17:09 +0100)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Wed, 23 Feb 2022 11:12:31 +0000 (11:12 +0000)
src/anvil/anvil-connection.c

index 31f6cc1cc7af8684589e1477692c09adaafce12d..5c810f5d17e2f15f17dd8500af9be0a3a2a35b54 100644 (file)
@@ -69,6 +69,7 @@ struct anvil_cmd_kick_target {
 struct anvil_cmd_kick {
        struct anvil_connection *conn;
        struct connect_limit_iter *iter;
+       bool add_conn_guid;
 
        pid_t prev_pid;
        int cmd_refcount;
@@ -254,6 +255,7 @@ kick_user_iter(struct anvil_connection *conn, struct connect_limit_iter *iter,
        kick = i_new(struct anvil_cmd_kick, 1);
        kick->conn = conn;
        kick->iter = iter;
+       kick->add_conn_guid = add_conn_guid;
        kick->prev_pid = (pid_t)-1;
        conn->refcount++;
 
@@ -286,7 +288,7 @@ kick_user_iter(struct anvil_connection *conn, struct connect_limit_iter *iter,
                                str_append(cmd, "KICK-USER\t");
                        str_append_tabescaped(cmd, result.username);
                        if (!guid_128_is_empty(result.conn_guid) &&
-                           add_conn_guid) {
+                           kick->add_conn_guid) {
                                str_append_c(cmd, '\t');
                                str_append_tabescaped(cmd,
                                        guid_128_to_string(result.conn_guid));