dovecot-2.2: doveadm: Added doveadm_username to specify the user...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3bf5df6f63b2
changeset: 18897:3bf5df6f63b2
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jun 30 13:58:15 2015 +0300
description:
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".

diffstat:

 src/doveadm/doveadm-settings.c  |  2 ++
 src/doveadm/doveadm-settings.h  |  1 +
 src/doveadm/server-connection.c |  2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r ac64c307d179 -r 3bf5df6f63b2 src/doveadm/doveadm-settings.c
--- 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 = "_",
diff -r ac64c307d179 -r 3bf5df6f63b2 src/doveadm/doveadm-settings.h
--- 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;
diff -r ac64c307d179 -r 3bf5df6f63b2 src/doveadm/server-connection.c
--- 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);