aboutsummaryrefslogtreecommitdiff
path: root/include/modules
diff options
context:
space:
mode:
authorGravatar Sadie Powell2023-06-29 19:15:41 +0100
committerGravatar Sadie Powell2023-06-29 19:15:41 +0100
commitcb43ae3e2b92f7637115ff295f7cab6e7d5d3937 (patch)
treef28ef3338aa6f24817db0506e022c1af8b478f5c /include/modules
parentRetain the "real" username properly like we do for hostnames. (diff)
Fix matching IP shuns.
Diffstat (limited to 'include/modules')
-rw-r--r--include/modules/shun.h3
1 files changed, 2 insertions, 1 deletions
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;