From: Timo Sirainen <tss@iki.fi>
Date: Mon, 31 Aug 2015 19:45:17 +0000 (+0300)
Subject: *-login: mail_max_userip_connections=0 was broken by f8ab4f979e92
X-Git-Tag: 2.2.19.rc1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce0d9d3daec7cbc2bd2c677999cb2b4ff22e5514;p=thirdparty%2Fdovecot%2Fcore.git

*-login: mail_max_userip_connections=0 was broken by f8ab4f979e92
---

diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index 5a67004c97..cacc2c201b 100644
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -169,7 +169,9 @@ anvil_lookup_callback(const char *reply, void *context)
 	if (reply != NULL && str_to_uint(reply, &conn_count) < 0)
 		i_fatal("Received invalid reply from anvil: %s", reply);
 
-	if (conn_count < set->mail_max_userip_connections)
+	/* reply=NULL if we didn't need to do anvil lookup,
+	   or if the anvil lookup failed. allow failed anvil lookups in. */
+	if (reply == NULL || conn_count < set->mail_max_userip_connections)
 		master_send_request(req);
 	else {
 		client->authenticating = FALSE;