imap-login: Generated IMAP capability wasn't being used.

--HG--
branch : HEAD

diff --git a/src/imap-login/client.c b/src/imap-login/client.c
index a11fcc320d006aaa59f7ae44a43c78cb241b1caf..c7b3f97d66a982f2e2107816f3adb36145828a42 100644 (file)
--- a/src/imap-login/client.c
+++ b/src/imap-login/client.c
@@ -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 @@ static const char *get_capability(struct imap_client *client, bool full)
        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 &&

diff --git a/src/master/login-process.c b/src/master/login-process.c
index da8cbcd042e01aef944cdba8bf316e243e40025f..9a4efff19ba93b5bbf6f8d13bb464d134ef01467 100644 (file)
--- a/src/master/login-process.c
+++ b/src/master/login-process.c
@@ -547,8 +547,9 @@ static void login_process_init_env(struct login_group *group, pid_t pid)
        }
 
        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));