diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-12-11 11:41:44 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-12-11 11:41:44 +0000 |
| commit | 565544fac966b14e046bb3042ab485f79bcf7c9e (patch) | |
| tree | feb6dc47d7a901f3f30413340e176281fd01ba98 | |
| parent | eba2c5ffd3bdea18cc83df12512aba33b5a734a7 (diff) | |
| parent | 25c1319e0d16f4cea707a3b7968b70530a5a333f (diff) | |
Merge branch 'insp20' into master.
| -rw-r--r-- | docs/conf/modules.conf.example | 6 | ||||
| -rw-r--r-- | src/channels.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_banexception.cpp | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index 7c5b0b6e8..95b742eb1 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -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"> # diff --git a/src/channels.cpp b/src/channels.cpp index 3bc58505c..7e6555ae8 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -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))) diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index b29b39747..4bfd19373 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -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))) |