summaryrefslogtreecommitdiff
path: root/src/modules/m_shun.cpp
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-05-03 11:56:03 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-05-03 11:56:03 +0000
commita1a5c322ce3310cdb439bf4b05182ae8d31a93ea (patch)
tree766385490129a313d42271ca0ac18a05f4712f96 /src/modules/m_shun.cpp
parent4d1275cc537fb49d0ce78f5ea117eecfcde8b3d3 (diff)
Allow E:Lines to exempt targets from SHUN and RLINE. Fixes bug #852 reported by Taros.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11355 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_shun.cpp')
-rw-r--r--src/modules/m_shun.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index f65b89ccf..56c57aee0 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -32,6 +32,10 @@ public:
bool Matches(User *u)
{
+ // E: overrides shun
+ if (u->exempt)
+ return false;
+
if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext) || InspIRCd::Match(u->nick+"!"+u->ident+"@"+u->GetIPString(), matchtext))
return true;