X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=502f947f45b0f4f442af00ef30e574ddc8934c5b;hb=6ec3d27b2a32ca54d8f62d5cd4b1e8e170ac0783;hp=91822b4e4bf054e078075caf834a8a214bc3e176;hpb=1ea821e8c1c7a65f826553bea7d5b7503f04243d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 91822b4e4..502f947f4 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -291,6 +291,7 @@ class CommandSilence : public Command
 class ModuleSilence : public Module
 {
 	unsigned int maxsilence;
+	bool ExemptULine;
 	CommandSilence cmdsilence;
 	CommandSVSSilence cmdsvssilence;
  public:
@@ -302,9 +303,13 @@ class ModuleSilence : public Module
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		maxsilence = ServerInstance->Config->ConfValue("silence")->getInt("maxentries", 32);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("silence");
+
+		maxsilence = tag->getInt("maxentries", 32);
 		if (!maxsilence)
 			maxsilence = 32;
+
+		ExemptULine = tag->getBool("exemptuline", true);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -351,6 +356,9 @@ class ModuleSilence : public Module
 
 	ModResult MatchPattern(User* dest, User* source, int pattern)
 	{
+		if (ExemptULine && source->server->IsULine())
+			return MOD_RES_PASSTHRU;
+
 		silencelist* sl = cmdsilence.ext.get(dest);
 		if (sl)
 		{