From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 28 Jun 2016 21:50:13 +0000 (+0300)
Subject: *-login: Don't disable auth penalty for login_trusted_networks.
X-Git-Tag: 2.3.0.rc1~3398
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d080f54d2be609dc3083452399add5be35e7739b;p=thirdparty%2Fdovecot%2Fcore.git

*-login: Don't disable auth penalty for login_trusted_networks.

It might or might not be a webmail (or something) that has its own penalty.
If the old behavior is still wanted, it's possible to do nowadays with e.g.:

passdb {
 driver = passwd-file
 args = username_format=%{rip} /etc/dovecot/passdb
}

/etc/dovecot/passdb:
192.168.10.123:::::::nodelay=yes
192.168.10.124:::::::nodelay=yes
---

diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index 8323b02dae..5d6d29cf9a 100644
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -69,10 +69,6 @@ client_get_auth_flags(struct client *client)
 		auth_flags |= AUTH_REQUEST_FLAG_VALID_CLIENT_CERT;
 	if (client->secured)
 		auth_flags |= AUTH_REQUEST_FLAG_SECURED;
-	if (client->trusted) {
-		/* e.g. webmail */
-		auth_flags |= AUTH_REQUEST_FLAG_NO_PENALTY;
-	}
 	if (login_binary->sasl_support_final_reply)
 		auth_flags |= AUTH_REQUEST_FLAG_SUPPORT_FINAL_RESP;
 	return auth_flags;