Mercurial > dovecot > core-2.2
changeset 20843:99c3726c1551
doveadm proxy kick: Support multiple user parameters.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Thu, 06 Oct 2016 14:54:51 +0300 |
| parents | 8c389aa81c15 |
| children | 90fad61ff8ae |
| files | src/doveadm/doveadm-proxy.c |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-proxy.c Thu Oct 06 14:53:11 2016 +0300 +++ b/src/doveadm/doveadm-proxy.c Thu Oct 06 14:54:51 2016 +0300 @@ -165,8 +165,10 @@ 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 @@ }, { .name = "proxy kick", - .usage = "[-a <ipc socket path>] [-f <passdb field>] <user>", + .usage = "[-a <ipc socket path>] [-f <passdb field>] <user> [...]", .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 } };