From 15d73b9d20d435ee7aaf0d7a3becf48e6ebcb088 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 27 Aug 2024 13:33:27 +0200
Subject: [PATCH] Support to block IPs in a vhost using append_host_config
 (#4038)

---
 src/mod_register.erl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mod_register.erl b/src/mod_register.erl
index d656263bf..6baea8cbb 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -573,24 +573,24 @@ may_remove_resource(From) -> From.
 get_ip_access(Host) ->
     mod_register_opt:ip_access(Host).
 
-check_ip_access({User, Server, Resource}, IPAccess) ->
+check_ip_access(Server, {User, Server, Resource}, IPAccess) ->
     case ejabberd_sm:get_user_ip(User, Server, Resource) of
         {IPAddress, _PortNumber} ->
-            check_ip_access(IPAddress, IPAccess);
+            check_ip_access(Server, IPAddress, IPAccess);
         _ ->
             deny
     end;
-check_ip_access(undefined, _IPAccess) ->
+check_ip_access(_Server, undefined, _IPAccess) ->
     deny;
-check_ip_access(IPAddress, IPAccess) ->
-    acl:match_rule(global, IPAccess, IPAddress).
+check_ip_access(Server, IPAddress, IPAccess) ->
+    acl:match_rule(Server, IPAccess, IPAddress).
 
 check_access(User, Server, Source) ->
     JID = jid:make(User, Server),
     Access = mod_register_opt:access(Server),
     IPAccess = get_ip_access(Server),
     case acl:match_rule(Server, Access, JID) of
-	allow -> check_ip_access(Source, IPAccess);
+	allow -> check_ip_access(Server, Source, IPAccess);
 	deny -> deny
     end.