global: Rename client_connection_type to doveadm_connection_type

diff --git a/src/doveadm/client-connection-http.c b/src/doveadm/client-connection-http.c
index 0469a3191128595141bd06bdb80311b8c2e4a723..77594d13336ae4dd3b54cf7839760aba49179c29 100644 (file)
--- a/src/doveadm/client-connection-http.c
+++ b/src/doveadm/client-connection-http.c
@@ -1188,7 +1188,7 @@ client_connection_http_create(int fd, bool ssl)
        conn = p_new(pool, struct client_connection_http, 1);
 
        if (client_connection_init(&conn->conn,
-               CLIENT_CONNECTION_TYPE_HTTP, pool, fd) < 0) {
+               DOVEADM_CONNECTION_TYPE_HTTP, pool, fd) < 0) {
                pool_unref(&conn->conn.pool);
                return NULL;
        }

diff --git a/src/doveadm/client-connection-private.h b/src/doveadm/client-connection-private.h
index bb703cd2945a016a8892bc6245ba11d5e620495b..8205531c5fb4581cca94d0e99b3c6d408d6dc460 100644 (file)
--- a/src/doveadm/client-connection-private.h
+++ b/src/doveadm/client-connection-private.h
@@ -7,7 +7,7 @@ bool doveadm_client_is_allowed_command(const struct doveadm_settings *set,
        const char *cmd_name);
 
 int client_connection_init(struct client_connection *conn,
-       enum doveadm_client_connection_type type, pool_t pool, int fd);
+       enum doveadm_client_type type, pool_t pool, int fd);
 void client_connection_destroy(struct client_connection **_conn);
 
 void client_connection_set_proctitle(struct client_connection *conn,

diff --git a/src/doveadm/client-connection-tcp.c b/src/doveadm/client-connection-tcp.c
index 3fcbcf439ef58872b1d2f50062e275a6290f1558..e96a23b2e4fb4200914aea6a7bf66f4277f395af 100644 (file)
--- a/src/doveadm/client-connection-tcp.c
+++ b/src/doveadm/client-connection-tcp.c
@@ -56,7 +56,7 @@ doveadm_server_log_handler(const struct failure_context *ctx,
        struct client_connection_tcp *conn = NULL;
 
        if (doveadm_client != NULL &&
-               doveadm_client->type == CLIENT_CONNECTION_TYPE_TCP)
+               doveadm_client->type == DOVEADM_CONNECTION_TYPE_TCP)
                conn = (struct client_connection_tcp *)doveadm_client;
 
        if (!log_recursing && conn != NULL &&
@@ -592,7 +592,7 @@ client_connection_tcp_free(struct client_connection *_conn)
        struct client_connection_tcp *conn =
                (struct client_connection_tcp *)_conn;
 
-       i_assert(_conn->type == CLIENT_CONNECTION_TYPE_TCP);
+       i_assert(_conn->type == DOVEADM_CONNECTION_TYPE_TCP);
 
        doveadm_print_deinit();
        doveadm_print_ostream = NULL;
@@ -622,7 +622,7 @@ client_connection_tcp_create(int fd, int listen_fd, bool ssl)
        conn->fd = fd;
 
        if (client_connection_init(&conn->conn,
-               CLIENT_CONNECTION_TYPE_TCP, pool, fd) < 0) {
+               DOVEADM_CONNECTION_TYPE_TCP, pool, fd) < 0) {
                client_connection_tcp_destroy(&conn);
                return NULL;
        }

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index c0e67bb7601d7a520869089f311fcbd7146c14e2..9644bd0f27e2767a0e4b20181cd149933676e8d2 100644 (file)
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -59,11 +59,11 @@ static int client_connection_read_settings(struct client_connection *conn)
 }
 
 int client_connection_init(struct client_connection *conn,
-       enum doveadm_client_connection_type type, pool_t pool, int fd)
+       enum doveadm_client_type type, pool_t pool, int fd)
 {
        const char *ip;
 
-       i_assert(type != CLIENT_CONNECTION_TYPE_CLI);
+       i_assert(type != DOVEADM_CONNECTION_TYPE_CLI);
 
        conn->type = type;
        conn->pool = pool;

diff --git a/src/doveadm/client-connection.h b/src/doveadm/client-connection.h
index 025e35bd323fbfc480a5870ba122a9c28968899b..bb3797e51d0e49b8440a7e9940ad82a8953b500d 100644 (file)
--- a/src/doveadm/client-connection.h
+++ b/src/doveadm/client-connection.h
@@ -7,7 +7,7 @@
 
 struct client_connection {
        pool_t pool;
-       enum doveadm_client_connection_type type;
+       enum doveadm_client_type type;
        const char *name;
 
        struct ip_addr local_ip, remote_ip;

diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 6c974f8c8d1e92777b687babb8a3c68163943718..e65f842196cf23e0c6ec1ce2e9cf052ac39c0aa0 100644 (file)
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -79,7 +79,7 @@ struct doveadm_cmd_context {
        struct ip_addr local_ip, remote_ip;
        in_port_t local_port, remote_port;
 
-       enum doveadm_client_connection_type conn_type;
+       enum doveadm_client_type conn_type;
        struct istream *input;
        struct ostream *output;
 };

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index e602a7389ab5535bc122d0a76730fe2b93d137f6..4af632dc44ef241834a1054c7654cde9ce4b52de 100644 (file)
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -686,7 +686,7 @@ cmd_dsync_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
        if (changes_during_sync != NULL || changes_during_sync2 != NULL) {
                /* don't log a warning when running via doveadm server
                   (e.g. called by replicator) */
-               if (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI) {
+               if (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI) {
                        i_warning("Mailbox changes caused a desync. "
                                  "You may want to run dsync again: %s",
                                  changes_during_sync == NULL ||
@@ -1142,7 +1142,7 @@ cmd_dsync_server_run(struct doveadm_mail_cmd_context *_ctx,
 {
        struct dsync_cmd_context *ctx = (struct dsync_cmd_context *)_ctx;
        struct doveadm_cmd_context *cctx = _ctx->cctx;
-       bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+       bool cli = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
        struct dsync_ibc *ibc;
        struct dsync_brain *brain;
        string_t *temp_prefix, *state_str = NULL;

diff --git a/src/doveadm/doveadm-kick.c b/src/doveadm/doveadm-kick.c
index 97a4b796af4369a6ec314fbdb9304d4c9327f392..5a485774f052b0338fd4280299b838d69a7d4a73 100644 (file)
--- a/src/doveadm/doveadm-kick.c
+++ b/src/doveadm/doveadm-kick.c
@@ -28,7 +28,7 @@ struct kick_pid {
 struct kick_context {
        struct who_context who;
        HASH_TABLE(void *, struct kick_pid *) pids;
-       enum doveadm_client_connection_type conn_type;
+       enum doveadm_client_type conn_type;
        bool force_kick;
        ARRAY(const char *) kicked_users;
 };
@@ -101,7 +101,7 @@ kick_print_kicked(struct kick_context *ctx, const bool show_warning)
 {
        unsigned int i, count;
        const char *const *users;
-       bool cli = (ctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+       bool cli = (ctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
 
        if (array_count(&ctx->kicked_users) == 0) {
                if (cli)
@@ -190,7 +190,7 @@ static void cmd_kick(struct doveadm_cmd_context *cctx)
                return;
        }
        ctx.conn_type = cctx->conn_type;
-       if (ctx.conn_type != CLIENT_CONNECTION_TYPE_CLI) {
+       if (ctx.conn_type != DOVEADM_CONNECTION_TYPE_CLI) {
                /* force-kick is a pretty ugly option. its output can't be
                   nicely translated to an API reply. it also wouldn't be very
                   useful in scripts, only for preventing a new admin from

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index c3760706bcff434aed678b1cebc93cb61bb5ca08..8465efb629190bd42d48bc5b9d88dd32b7a5798c 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -223,7 +223,7 @@ static void doveadm_mail_cmd_input_read(struct doveadm_mail_cmd_context *ctx)
 void doveadm_mail_get_input(struct doveadm_mail_cmd_context *ctx)
 {
        const struct doveadm_cmd_context *cctx = ctx->cctx;
-       bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+       bool cli = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
        struct istream *inputs[2];
 
        if (ctx->cmd_input != NULL)
@@ -594,7 +594,7 @@ doveadm_mail_cmd_exec(struct doveadm_mail_cmd_context *ctx,
                      const char *wildcard_user)
 {
        const struct doveadm_cmd_context *cctx = ctx->cctx;
-       bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+       bool cli = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
        int ret;
        const char *error;
 
@@ -662,7 +662,7 @@ doveadm_mail_cmd(const struct doveadm_mail_cmd *cmd, int argc, char *argv[])
        int c;
 
        i_zero(&cctx);
-       cctx.conn_type = CLIENT_CONNECTION_TYPE_CLI;
+       cctx.conn_type = DOVEADM_CONNECTION_TYPE_CLI;
        cctx.username = getenv("USER");
 
        ctx = doveadm_mail_cmdline_init(cmd);
@@ -964,8 +964,8 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx)
        const char *fieldstr;
        ARRAY_TYPE(const_string) pargv, full_args;
        int i;
-       bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
-       bool tcp_server = (cctx->conn_type == CLIENT_CONNECTION_TYPE_TCP);
+       bool cli = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
+       bool tcp_server = (cctx->conn_type == DOVEADM_CONNECTION_TYPE_TCP);
        struct doveadm_mail_cmd mail_cmd = {
                cctx->cmd->mail_cmd, cctx->cmd->name, cctx->cmd->usage
        };

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 0d8aeaed29864c0d3db3aacb7f30c849357de7a8..6a45c4f7767fb4ddf5bd5d0c9b5530c3d0cadbbb 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -299,7 +299,7 @@ int main(int argc, char *argv[])
        int c;
 
        i_zero(&cctx);
-       cctx.conn_type = CLIENT_CONNECTION_TYPE_CLI;
+       cctx.conn_type = DOVEADM_CONNECTION_TYPE_CLI;
 
        i_set_failure_exit_callback(failure_exit_callback);
        doveadm_dsync_main(&argc, &argv);

diff --git a/src/doveadm/doveadm.h b/src/doveadm/doveadm.h
index bedf404a43d47781fc5adc815814f6dba5dcaefc..7f09681b868b4737d0ab01a0034d57be71bb40d0 100644 (file)
--- a/src/doveadm/doveadm.h
+++ b/src/doveadm/doveadm.h
@@ -11,10 +11,10 @@
 #define DOVEADM_EX_NOTPOSSIBLE EX_DATAERR
 #define DOVEADM_EX_UNKNOWN -1
 
-enum doveadm_client_connection_type {
-       CLIENT_CONNECTION_TYPE_CLI = 0,
-       CLIENT_CONNECTION_TYPE_TCP,
-       CLIENT_CONNECTION_TYPE_HTTP,
+enum doveadm_client_type {
+       DOVEADM_CONNECTION_TYPE_CLI = 0,
+       DOVEADM_CONNECTION_TYPE_TCP,
+       DOVEADM_CONNECTION_TYPE_HTTP,
 };
 
 #include "doveadm-cmd.h"

diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c
index 10c3e7b5a931a07201a547b8fdbc8db73d8dc54c..d44023290b95654046c16e1c914c5d1d64d3b756 100644 (file)
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c
@@ -692,7 +692,7 @@ static int cmd_mcp_key_password_run(struct doveadm_mail_cmd_context *_ctx,
 {
        struct mcp_cmd_context *ctx =
                (struct mcp_cmd_context *)_ctx;
-       bool cli = (_ctx->cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
+       bool cli = (_ctx->cctx->conn_type == DOVEADM_CONNECTION_TYPE_CLI);
 
        struct raw_key {
                const char *attr;