From 0bbfafb9d072c8ea4f5437289213d1ae8fe94a2b Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 18 Jun 2021 13:35:01 +0100
Subject: Fix some inverted ignoreuntil values in the connectban module.

---
 src/modules/m_connectban.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_connectban.cpp')

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
-- 
cgit v1.3.1-10-gc9f91