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".

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index 9b296ebbde31b7df520e68f3b58e419030754df0..126f632245a782d2cded5b3459b52969a61be789 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -61,6 +61,7 @@ static const struct setting_define doveadm_setting_defines[] = {
        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 @@ const struct doveadm_settings doveadm_default_settings = {
        .doveadm_socket_path = "doveadm-server",
        .doveadm_worker_count = 0,
        .doveadm_port = 0,
+       .doveadm_username = "doveadm",
        .doveadm_password = "",
        .doveadm_allowed_commands = "",
        .dsync_alt_char = "_",

diff --git a/src/doveadm/doveadm-settings.h b/src/doveadm/doveadm-settings.h
index ca25bbb2a0f5203062700d4624839ad05d8e73e5..4206a5e0c339d4cbd78af262451538c0073850f9 100644 (file)
--- a/src/doveadm/doveadm-settings.h
+++ b/src/doveadm/doveadm-settings.h
@@ -10,6 +10,7 @@ struct doveadm_settings {
        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 --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c
index 56cee0454ee4a1d60a0982d25c385828c559fc7f..e60b51670496db15a57ab8cb9113b3e8121533fe 100644 (file)
--- a/src/doveadm/server-connection.c
+++ b/src/doveadm/server-connection.c
@@ -243,7 +243,7 @@ server_connection_authenticate(struct server_connection *conn)
        }
 
        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);