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

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 3895705e028410d31eb9440aec38650b4c3cfdb4..2394efaa37c7bec2103ea2fa2ebc3b3486f79e9e 100644 (file)
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -57,6 +57,9 @@ class RLine : public XLine
 
        bool Matches(User *u)
        {
+               if (u->exempt)
+                       return false;
+
                std::string compare = u->nick + "!" + u->ident + "@" + u->host + " " + u->fullname;
                return regex->Matches(compare);
        }

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index f65b89ccf407326341d6f55a0271afc8e1cb7e86..56c57aee0e2245d591e9a4d216bae788c72b388b 100644 (file)
--- 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;