From dfc18db1dd3d18a977b3b1cb073c6b99a17e15f6 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 23 Jul 2015 08:25:28 -0400 Subject: Remove unused variables from m_ldap --- data/modules.example.conf | 1 - modules/extra/m_ldap.cpp | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/data/modules.example.conf b/data/modules.example.conf index 3baba44eb..7e1a4eca5 100644 --- a/data/modules.example.conf +++ b/data/modules.example.conf @@ -243,7 +243,6 @@ module { name = "help" } ldap { server = "ldap://127.0.0.1" - port = 389 /* * Admin credentials used for performing searches and adding users. diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp index 26ee7f4a8..ed26b87f1 100644 --- a/modules/extra/m_ldap.cpp +++ b/modules/extra/m_ldap.cpp @@ -137,10 +137,8 @@ class LDAPModify : public LDAPRequest class LDAPService : public LDAPProvider, public Thread, public Condition { Anope::string server; - int port; Anope::string admin_binddn; Anope::string admin_pass; - time_t timeout; LDAP *con; @@ -229,7 +227,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition query_queue queries, results; Mutex process_mutex; /* held when processing requests not in either queue */ - LDAPService(Module *o, const Anope::string &n, const Anope::string &s, int po, const Anope::string &b, const Anope::string &p, time_t t) : LDAPProvider(o, n), server(s), port(po), admin_binddn(b), admin_pass(p), timeout(t), last_connect(0) + LDAPService(Module *o, const Anope::string &n, const Anope::string &s, const Anope::string &b, const Anope::string &p) : LDAPProvider(o, n), server(s), admin_binddn(b), admin_pass(p), last_connect(0) { Connect(); } @@ -491,14 +489,12 @@ class ModuleLDAP : public Module, public Pipe if (this->LDAPServices.find(connname) == this->LDAPServices.end()) { const Anope::string &server = ldap->Get("server", "127.0.0.1"); - int port = ldap->Get("port", "389"); const Anope::string &admin_binddn = ldap->Get("admin_binddn"); const Anope::string &admin_password = ldap->Get("admin_password"); - time_t timeout = ldap->Get("timeout", "5"); try { - LDAPService *ss = new LDAPService(this, connname, server, port, admin_binddn, admin_password, timeout); + LDAPService *ss = new LDAPService(this, connname, server, admin_binddn, admin_password); ss->Start(); this->LDAPServices.insert(std::make_pair(connname, ss)); -- cgit