# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1520645229 -3600
# Node ID 046041a37c1e1d71244733948b3766f823f4ab9d
# Parent  e3d953481f7d069e117f84b699eea8293117905c
mod_register_limits: Log message for white- and blacklist hits separate

diff -r e3d953481f7d -r 046041a37c1e plugins/mod_register_limits.lua
--- a/plugins/mod_register_limits.lua	Sat Mar 10 02:24:18 2018 +0100
+++ b/plugins/mod_register_limits.lua	Sat Mar 10 02:27:09 2018 +0100
@@ -60,8 +60,11 @@
 	local log = session and session.log or module._log;
 	if not ip then
 		log("debug", "User's IP not known; can't apply blacklist/whitelist");
-	elseif ip_in_set(blacklisted_ips, event.ip) or (whitelist_only and not ip_in_set(whitelisted_ips, ip)) then
-		log("debug", "Registration disallowed by white- or blacklist");
+	elseif ip_in_set(blacklisted_ips, event.ip) then
+		log("debug", "Registration disallowed by blacklist");
+		event.allowed = false;
+	elseif (whitelist_only and not ip_in_set(whitelisted_ips, ip)) then
+		log("debug", "Registration disallowed by whitelist");
 		event.allowed = false;
 	elseif throttle_max and not ip_in_set(whitelisted_ips, ip) then
 		if not check_throttle(event.ip) then