aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Sadie Powell2021-06-18 13:35:01 +0100
committerGravatar Sadie Powell2021-06-18 13:35:01 +0100
commit0bbfafb9d072c8ea4f5437289213d1ae8fe94a2b (patch)
tree8070221963b40162f7b0ef11bb4219d046d453b1 /src
parentFix some weirdness with sign conversion and channel limits. (diff)
Fix some inverted ignoreuntil values in the connectban module.
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_connectban.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 53aef6ca8..d8741a141 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -113,7 +113,7 @@ class ModuleConnectBan CXX11_FINAL
banmessage = tag->getString("banmessage", "Your IP range has been attempting to connect too many times in too short a duration. Wait a while, and you will be able to connect.");
if (status.initial)
- ignoreuntil = std::max<time_t>(ignoreuntil, ServerInstance->Time() + splitwait);
+ ignoreuntil = ServerInstance->Time() + bootwait;
}
void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE
@@ -133,7 +133,7 @@ class ModuleConnectBan CXX11_FINAL
void OnServerSplit(const Server* server, bool error) CXX11_OVERRIDE
{
if (splitwait)
- ignoreuntil = ServerInstance->Time() + splitwait;
+ ignoreuntil = std::max<time_t>(ignoreuntil, ServerInstance->Time() + splitwait);
}
void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE