From: Timo Sirainen <tss@iki.fi>
Date: Wed, 22 Apr 2009 18:27:33 +0000 (-0400)
Subject: imap-login: Generated IMAP capability wasn't being used.
X-Git-Tag: 2.0.alpha1~898
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a33dcf1d17af76fd08a0a5e60ef929b9538e4e4;p=thirdparty%2Fdovecot%2Fcore.git

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 a11fcc320d..c7b3f97d66 100644
--- 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 da8cbcd042..9a4efff19b 100644
--- 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));