From e07044df54448c45bdbcf8b4c1e08d75ae176239 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 6 Oct 2016 14:54:51 +0300 Subject: [PATCH] doveadm proxy kick: Support multiple user parameters. --- src/doveadm/doveadm-proxy.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/doveadm/doveadm-proxy.c b/src/doveadm/doveadm-proxy.c index b1d4761e05..aca69b6f12 100644 --- a/src/doveadm/doveadm-proxy.c +++ b/src/doveadm/doveadm-proxy.c @@ -165,8 +165,10 @@ static void cmd_proxy_kick(int argc, char *argv[]) str_append(cmd, "KICK-ALT\t"); str_append_tabescaped(cmd, ctx->username_field); } - str_append_c(cmd, '\t'); - str_append_tabescaped(cmd, argv[optind]); + for (; argv[optind] != NULL; optind++) { + str_append_c(cmd, '\t'); + str_append_tabescaped(cmd, argv[optind]); + } ipc_client_cmd(ctx->ipc, str_c(cmd), cmd_proxy_kick_callback, NULL); io_loop_run(current_ioloop); ipc_client_deinit(&ctx->ipc); @@ -183,12 +185,12 @@ DOVEADM_CMD_PARAMS_END }, { .name = "proxy kick", - .usage = "[-a ] [-f ] ", + .usage = "[-a ] [-f ] [...]", .old_cmd = cmd_proxy_kick, DOVEADM_CMD_PARAMS_START DOVEADM_CMD_PARAM('a', "socket-path", CMD_PARAM_STR, 0) DOVEADM_CMD_PARAM('f', "passdb-field", CMD_PARAM_STR, 0) -DOVEADM_CMD_PARAM('\0', "user", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAM('\0', "user", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL) DOVEADM_CMD_PARAMS_END } }; -- 2.47.3