From a1a5c322ce3310cdb439bf4b05182ae8d31a93ea Mon Sep 17 00:00:00 2001
From: w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sun, 3 May 2009 11:56:03 +0000
Subject: 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
---
 src/modules/m_shun.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/modules/m_shun.cpp')

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;
 
-- 
cgit v1.2.3