From: Sadie Powell <sadie@witchery.services>
Date: Sun, 29 Mar 2020 10:58:09 +0000 (+0100)
Subject: Include ADMIN and OPER in the default for <shun:enabledcmds>.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=92732be632831cbb0751a5f2ad3d89e9bf87b2dd;p=user%2Fhenk%2Fcode%2Finspircd.git

Include ADMIN and OPER in the default for <shun:enabledcmds>.
---

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 8d1ee8074..c7a3f7dc7 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -2109,7 +2109,7 @@
 # You can optionally let the user know that their command was blocked.
 #
 # You may also let SHUN affect opers (defaults to no).
-#<shun enabledcommands="ADMIN PING PONG QUIT PART JOIN" notifyuser="yes" affectopers="no">
+#<shun enabledcommands="ADMIN OPER PING PONG QUIT PART JOIN" notifyuser="yes" affectopers="no">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # SSL mode module: Adds support for SSL-only channels via the '+z'
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index f10ac79f5..6eaa6b47c 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -196,7 +196,7 @@ class ModuleShun : public Module, public Stats::EventListener
 		ConfigTag* tag = ServerInstance->Config->ConfValue("shun");
 
 		ShunEnabledCommands.clear();
-		irc::spacesepstream enabledcmds(tag->getString("enabledcommands", "PING PONG QUIT", 1));
+		irc::spacesepstream enabledcmds(tag->getString("enabledcommands", "ADMIN OPER PING PONG QUIT", 1));
 		for (std::string enabledcmd; enabledcmds.GetToken(enabledcmd); )
 		{
 			std::transform(enabledcmd.begin(), enabledcmd.end(), enabledcmd.begin(), ::toupper);