Mercurial > dovecot > core-2.2
changeset 18897:3bf5df6f63b2
doveadm: Added doveadm_username to specify the username for authentication.
The default is still "doveadm" and the server side doesn't currently support
anything except "doveadm".
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 30 Jun 2015 13:58:15 +0300 |
| parents | ac64c307d179 |
| children | 7a6452869981 |
| files | src/doveadm/doveadm-settings.c src/doveadm/doveadm-settings.h src/doveadm/server-connection.c |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-settings.c Tue Jun 30 12:18:08 2015 +0300 +++ b/src/doveadm/doveadm-settings.c Tue Jun 30 13:58:15 2015 +0300 @@ -61,6 +61,7 @@ DEF(SET_UINT, doveadm_worker_count), DEF(SET_UINT, doveadm_port), { SET_ALIAS, "doveadm_proxy_port", 0, NULL }, + DEF(SET_STR, doveadm_username), DEF(SET_STR, doveadm_password), DEF(SET_STR, doveadm_allowed_commands), DEF(SET_STR, dsync_alt_char), @@ -83,6 +84,7 @@ .doveadm_socket_path = "doveadm-server", .doveadm_worker_count = 0, .doveadm_port = 0, + .doveadm_username = "doveadm", .doveadm_password = "", .doveadm_allowed_commands = "", .dsync_alt_char = "_",
--- a/src/doveadm/doveadm-settings.h Tue Jun 30 12:18:08 2015 +0300 +++ b/src/doveadm/doveadm-settings.h Tue Jun 30 13:58:15 2015 +0300 @@ -10,6 +10,7 @@ const char *doveadm_socket_path; unsigned int doveadm_worker_count; unsigned int doveadm_port; + const char *doveadm_username; const char *doveadm_password; const char *doveadm_allowed_commands; const char *dsync_alt_char;
--- a/src/doveadm/server-connection.c Tue Jun 30 12:18:08 2015 +0300 +++ b/src/doveadm/server-connection.c Tue Jun 30 13:58:15 2015 +0300 @@ -243,7 +243,7 @@ } str_append_c(plain, '\0'); - str_append(plain, "doveadm"); + str_append(plain, conn->set->doveadm_username); str_append_c(plain, '\0'); str_append(plain, conn->set->doveadm_password);