Mercurial > dovecot > core-2.2
changeset 19948:c01499a4ca0f
doveadm: Getting user from USER environment wasn't done in the right place.
doveadm_mail_cmdline_init() is also called when parsing commands from
doveadm-server. The USER environment is supposed to be read only from
doveadm command line.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Wed, 23 Mar 2016 10:08:06 +0900 |
| parents | 7b498de3bdba |
| children | 761f81b9a814 |
| files | src/doveadm/doveadm-mail.c src/doveadm/doveadm.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail.c Mon Mar 21 22:10:08 2016 +0900 +++ b/src/doveadm/doveadm-mail.c Wed Mar 23 10:08:06 2016 +0900 @@ -557,7 +557,6 @@ ctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT; if (doveadm_debug) ctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_DEBUG; - ctx->cur_username = getenv("USER"); return ctx; } @@ -933,7 +932,7 @@ }; mctx = doveadm_mail_cmdline_init(&mail_cmd); - + mctx->cur_username = cctx->username; mctx->iterate_all_users = FALSE; wildcard_user = NULL; p_array_init(&pargv, mctx->pool, 8);
--- a/src/doveadm/doveadm.c Mon Mar 21 22:10:08 2016 +0900 +++ b/src/doveadm/doveadm.c Wed Mar 23 10:08:06 2016 +0900 @@ -291,6 +291,7 @@ memset(&cctx,0,sizeof(cctx)); cctx.cli = TRUE; + cctx.username = getenv("USER"); i_set_failure_exit_callback(failure_exit_callback); doveadm_dsync_main(&argc, &argv);