aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/m_ldapauth.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-10-31 20:03:19 +0000
committerGravatar Sadie Powell2020-10-31 22:33:35 +0000
commit441bd151da733d32e194de6e4a1744ae273b83ee (patch)
tree74eb1ee2aef413185bf3906a17f1b2c27373e03a /src/modules/m_ldapauth.cpp
parentFix reading the <sslprofile> config. (diff)
downloadinspircd++-441bd151da733d32e194de6e4a1744ae273b83ee.tar.gz
inspircd++-441bd151da733d32e194de6e4a1744ae273b83ee.tar.bz2
inspircd++-441bd151da733d32e194de6e4a1744ae273b83ee.zip
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.
Diffstat (limited to 'src/modules/m_ldapauth.cpp')
-rw-r--r--src/modules/m_ldapauth.cpp14
1 files changed, 5 insertions, 9 deletions
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));