Rework the config file reader to be much more flexible and move many configuration directives to the actual modules they are used in.

1 files changed, 9 insertions, 7 deletions

diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp
index afe3fde48..4324a7bc0 100644
--- a/modules/extra/m_ldap_oper.cpp
+++ b/modules/extra/m_ldap_oper.cpp
@@ -1,5 +1,5 @@
 #include "module.h"
-#include "ldap.h"
+#include "ldapapi.h"
 
 static std::set<Oper *> my_opers;
 static Anope::string opertype_attribute;
@@ -93,13 +93,15 @@ class LDAPOper : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	void OnReload(ServerConfig *conf, ConfigReader &reader) anope_override
+	void OnReload(Configuration::Conf *conf) anope_override
 	{
-		this->binddn = reader.ReadValue("m_ldap_oper", "binddn", "", 0);
-		this->password = reader.ReadValue("m_ldap_oper", "password", "", 0);
-		this->basedn = reader.ReadValue("m_ldap_oper", "basedn", "", 0);
-		this->filter = reader.ReadValue("m_ldap_oper", "filter", "", 0);
-		opertype_attribute = reader.ReadValue("m_ldap_oper", "opertype_attribute", "", 0);
+		Configuration::Block *config = Config->GetModule(this);
+
+		this->binddn = config->Get<const Anope::string &>("binddn");
+		this->password = config->Get<const Anope::string &>("password");
+		this->basedn = config->Get<const Anope::string &>("basedn");
+		this->filter = config->Get<const Anope::string &>("filter");
+		opertype_attribute = config->Get<const Anope::string &>("opertype_attribute");
 
 		for (std::set<Oper *>::iterator it = my_opers.begin(), it_end = my_opers.end(); it != it_end; ++it)
 			delete *it;