From: Timo Sirainen <tss@iki.fi>
Date: Tue, 2 Mar 2010 11:21:26 +0000 (+0200)
Subject: *-login: When showing mail_max_userip_connections error, show the limit also.
X-Git-Tag: 2.0.beta4~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0260228211971bd37d78183043c6f9f5a8d50a9;p=thirdparty%2Fdovecot%2Fcore.git

*-login: When showing mail_max_userip_connections error, show the limit also.

--HG--
branch : HEAD
---

diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index c69a0def46..d5f632bb49 100644
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -21,7 +21,7 @@
 
 #define ERR_TOO_MANY_USERIP_CONNECTIONS \
 	"Maximum number of connections from user+IP exceeded " \
-	"(mail_max_userip_connections)"
+	"(mail_max_userip_connections=%u)"
 
 struct anvil_request {
 	struct client *client;
@@ -140,14 +140,18 @@ static void anvil_lookup_callback(const char *reply, void *context)
 {
 	struct anvil_request *req = context;
 	struct client *client = req->client;
+	const struct login_settings *set = client->set;
+	const char *errmsg;
 
 	if (reply == NULL ||
-	    strtoul(reply, NULL, 10) < client->set->mail_max_userip_connections)
+	    strtoul(reply, NULL, 10) < set->mail_max_userip_connections)
 		master_send_request(req);
 	else {
 		client->authenticating = FALSE;
+		errmsg = t_strdup_printf(ERR_TOO_MANY_USERIP_CONNECTIONS,
+					 set->mail_max_userip_connections);
 		call_client_callback(client, SASL_SERVER_REPLY_MASTER_FAILED,
-				     ERR_TOO_MANY_USERIP_CONNECTIONS, NULL);
+				     errmsg, NULL);
 	}
 	i_free(req);
 }