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 8d1ee807415ba3e0e9de2010876a765fa37fac9c..c7a3f7dc7a9b2577be0cd1c521f269a9fc3205c0 100644 (file)
--- 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 f10ac79f57c304b5114d824f335742ba64c8f5df..6eaa6b47c79e14b31d27812c182590638c258eac 100644 (file)
--- 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);