Mercurial > dovecot > core-2.2
changeset 9154:213c2f313bc1 HEAD
imap-login: Generated IMAP capability wasn't being used.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Wed, 22 Apr 2009 14:27:33 -0400 |
parents | f8508e7aca6c |
children | 3dae5834ded3 |
files | src/imap-login/client.c src/master/login-process.c |
diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap-login/client.c Wed Apr 22 14:26:31 2009 -0400 +++ b/src/imap-login/client.c Wed Apr 22 14:27:33 2009 -0400 @@ -46,7 +46,6 @@ "* OK Waiting for authentication process to respond.." const char *login_protocol = "IMAP"; -const char *capability_string = CAPABILITY_STRING; static void client_set_title(struct imap_client *client) { @@ -97,7 +96,8 @@ const char *auths; auths = client_authenticate_get_capabilities(client->common.secured); - return t_strconcat(full ? capability_string : CAPABILITY_BANNER_STRING, + return t_strconcat(full ? login_settings->capability_string : + CAPABILITY_BANNER_STRING, (ssl_initialized && !client->common.tls) ? " STARTTLS" : "", login_settings->disable_plaintext_auth &&
--- a/src/master/login-process.c Wed Apr 22 14:26:31 2009 -0400 +++ b/src/master/login-process.c Wed Apr 22 14:27:33 2009 -0400 @@ -547,8 +547,9 @@ } env_put(t_strconcat("PROCESS_UID=", dec2str(pid), NULL)); - if (group->mail_process_type == PROCESS_TYPE_IMAP) { - env_put(t_strconcat("GENERATED_CAPABILITY=", + if (group->mail_process_type == PROCESS_TYPE_IMAP && + set->imap_generated_capability != NULL) { + env_put(t_strconcat("CAPABILITY_STRING=", set->imap_generated_capability, NULL)); } env_put(t_strconcat("LOGIN_DIR=", set->login_dir, NULL));