From d6122e692b0f710e00a0547d77d1cce23dad4daf Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 28 Mar 2025 11:18:30 +0000
Subject: Remove more v3 config compat.

---
 modules/ldapauth.cpp | 13 -------------
 modules/sqlauth.cpp  |  6 ------
 2 files changed, 19 deletions(-)

(limited to 'modules')

diff --git a/modules/ldapauth.cpp b/modules/ldapauth.cpp
index cc2dcd2e0..ae0170ebf 100644
--- a/modules/ldapauth.cpp
+++ b/modules/ldapauth.cpp
@@ -376,19 +376,6 @@ public:
 			if (!mask.empty())
 				exemptions.push_back(mask);
 		}
-
-		// Begin v3 config compatibility.
-		for (const auto& [_, wtag] : ServerInstance->Config->ConfTags("ldapwhitelist"))
-		{
-			const std::string cidr = wtag->getString("cidr");
-			if (!cidr.empty())
-				exemptions.push_back("*!*@" + cidr);
-		}
-
-		irc::spacesepstream nickstream(tag->getString("allowpattern"));
-		for (std::string nick; nickstream.GetToken(nick); )
-			exemptions.push_back(nick + "!*@*");
-		// End v3 config compatibility.
 	}
 
 	void OnUserConnect(LocalUser* user) override
diff --git a/modules/sqlauth.cpp b/modules/sqlauth.cpp
index cf7da4476..2c8196ff7 100644
--- a/modules/sqlauth.cpp
+++ b/modules/sqlauth.cpp
@@ -167,12 +167,6 @@ public:
 				exemptions.push_back(mask);
 		}
 
-		// Begin v3 config compatibility.
-		const std::string allowpattern = conf->getString("allowpattern");
-		if (!allowpattern.empty())
-			exemptions.push_back(allowpattern + "!*@*");
-		// End v3 config compatibility.
-
 		hash_algos.clear();
 		irc::commasepstream algos(conf->getString("hash", "sha1,sha256"));
 		std::string algo;
-- 
cgit v1.3.1-10-gc9f91