ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp20' into master.

Browse Source
This commit is contained in:
Peter Powell 2017-12-11 11:41:44 +00:00
commit 565544fac9
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/conf/modules.conf.example
View File

@ -1964,9 +1964,6 @@
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# SQL authentication module: Allows IRCd connections to be tied into
# a database table (for example a forum).
# This module is in extras. Re-run configure with:
# ./configure --enable-extras=m_sqlauth.cpp
# and run make install, then uncomment this module to enable it.
#
#<module name="sqlauth">
#
@ -1977,9 +1974,6 @@
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# SQL oper module: Allows you to store oper credentials in an SQL table
# This module is in extras. Re-run configure with:
# ./configure --enable-extras=m_sqloper.cpp
# and run make install, then uncomment this module to enable it.
#
#<module name="sqloper">
#

2
src/channels.cpp
View File

@ -408,7 +408,7 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
{
for (ListModeBase::ModeList::const_iterator it = bans->begin(); it != bans->end(); ++it)
{
if (it->mask[0] != type || it->mask[1] != ':')
if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
continue;
if (CheckBan(user, it->mask.substr(2)))

2
src/modules/m_banexception.cpp
View File

@ -64,7 +64,7 @@ class ModuleBanException : public Module
for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
{
if (it->mask[0] != type || it->mask[1] != ':')
if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
continue;
if (chan->CheckBan(user, it->mask.substr(2)))