diff options
| author |  Sadie Powell | 2019-07-16 15:11:21 +0100 |
|---|---|---|
| committer | Sadie Powell | 2019-07-16 16:48:18 +0100 |
| commit | cd8b456f979733525941284639d8bf899173b429 (patch) | |
| tree | f1d26962e61c74c5acb076662a909beafbe8e5fd /src/modules/m_denychans.cpp | |
| parent | Replace socketengine_{pthread,win32} with C++11 threads. (diff) | |
| parent | ssl_gnutls: remove PackageInfo directives for EOL Debian versions. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_denychans.cpp')
| -rw-r--r-- | src/modules/m_denychans.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index df8c0e8a0..06b38952d 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -120,9 +120,18 @@ class ModuleDenyChannels : public Module continue; // If the redirect channel is whitelisted then it is okay. + bool whitelisted = false; for (GoodChannels::const_iterator j = goodchans.begin(); j != goodchans.end(); ++j) + { if (InspIRCd::Match(badchan.redirect, *j)) - continue; + { + whitelisted = true; + break; + } + } + + if (whitelisted) + continue; // If the redirect channel is not blacklisted then it is okay. for (BadChannels::const_iterator j = badchans.begin(); j != badchans.end(); ++j) |