From 441bd151da733d32e194de6e4a1744ae273b83ee Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sat, 31 Oct 2020 20:03:19 +0000
Subject: Add stdalgo::iterator_range and switch config tag reading to use it.

This allows us to use range-based for loops which were not possible
with the previous config tag system.
---
 src/modules/m_ldapauth.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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

diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index 1dd7bac75..55a6b4c8f 100644
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -338,22 +338,18 @@ public:
 
 		LDAP.SetProvider("LDAP/" + tag->getString("dbid"));
 
-		ConfigTagList whitelisttags = ServerInstance->Config->ConfTags("ldapwhitelist");
-
-		for (ConfigIter i = whitelisttags.first; i != whitelisttags.second; ++i)
+		for (auto& [_, wtag] : ServerInstance->Config->ConfTags("ldapwhitelist"))
 		{
-			std::string cidr = i->second->getString("cidr");
+			std::string cidr = wtag->getString("cidr");
 			if (!cidr.empty()) {
 				whitelistedcidrs.push_back(cidr);
 			}
 		}
 
-		ConfigTagList attributetags = ServerInstance->Config->ConfTags("ldaprequire");
-
-		for (ConfigIter i = attributetags.first; i != attributetags.second; ++i)
+		for (auto& [_, rtag] : ServerInstance->Config->ConfTags("ldaprequire"))
 		{
-			const std::string attr = i->second->getString("attribute");
-			const std::string val = i->second->getString("value");
+			const std::string attr = rtag->getString("attribute");
+			const std::string val = rtag->getString("value");
 
 			if (!attr.empty() && !val.empty())
 				requiredattributes.push_back(make_pair(attr, val));
-- 
cgit v1.3.1-10-gc9f91