From: Timo Sirainen <tss@iki.fi>
Date: Thu, 19 Aug 2010 17:28:20 +0000 (+0100)
Subject: pop3: Show APOP challenge only when APOP auth mechanism is enabled.
X-Git-Tag: 2.0.1~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dae0fbe100f1fd724518ee748306e306f31369e5;p=thirdparty%2Fdovecot%2Fcore.git

pop3: Show APOP challenge only when APOP auth mechanism is enabled.
---

diff --git a/src/pop3-login/client.c b/src/pop3-login/client.c
index 1968659d18..3b78c85682 100644
--- a/src/pop3-login/client.c
+++ b/src/pop3-login/client.c
@@ -138,6 +138,11 @@ static char *get_apop_challenge(struct pop3_client *client)
 	unsigned char buffer_base64[MAX_BASE64_ENCODED_SIZE(sizeof(buffer)) + 1];
 	buffer_t buf;
 
+	if (auth_client_find_mech(auth_client, "APOP") == NULL) {
+		/* disabled, no need to present the challenge */
+		return NULL;
+	}
+
 	auth_client_get_connect_id(auth_client, &client->apop_server_pid,
 				   &client->apop_connect_uid);