From cb43ae3e2b92f7637115ff295f7cab6e7d5d3937 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Thu, 29 Jun 2023 19:15:41 +0100
Subject: Fix matching IP shuns.

---
 include/modules/shun.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/modules')

diff --git a/include/modules/shun.h b/include/modules/shun.h
index 70f0efe53..6bff18763 100644
--- a/include/modules/shun.h
+++ b/include/modules/shun.h
@@ -53,7 +53,8 @@ public:
 		if (InspIRCd::Match(u->GetUserAddress(), matchtext))
 			return true;
 
-		if (InspIRCd::MatchCIDR(u->GetAddress(), matchtext, ascii_case_insensitive_map))
+		const std::string addressmask = INSP_FORMAT("{}!{}", u->nick, u->GetAddress());
+		if (InspIRCd::MatchCIDR(addressmask, matchtext, ascii_case_insensitive_map))
 			return true;
 
 		return false;
-- 
cgit v1.3.1-10-gc9f91