allow opers with security override enabled using MODE_NOFLOOD with the ! flag on...

diff --git a/src/chanserv.c b/src/chanserv.c
index a76992e8579ff8beeae944508a55c17e61d9d9cc..e1fc9749a66e68bf197d34ab8c0fd9ed351a4dca 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -5674,7 +5674,7 @@ static MODCMD_FUNC(chan_opt_modes)
         {
             memset(&channel->channel_info->modes, 0, sizeof(channel->channel_info->modes));
         }
-        else if(!(new_modes = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE|MCP_IGN_REGISTERED|MCP_NO_APASS, 0)))
+        else if(!(new_modes = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE|MCP_IGN_REGISTERED|MCP_NO_APASS|(IsOper(user) && IsHelping(user) ? MCP_OPERMODE : 0), 0)))
         {
             reply("CSMSG_INVALID_MODE_LOCK", unsplit_string(argv+1, argc-1, NULL));
             return 0;