Fix module unmapping with culled Module objects

[user/henk/code/inspircd.git] / src / modules / extra / m_ldapoper.cpp

diff --git a/src/modules/extra/m_ldapoper.cpp b/src/modules/extra/m_ldapoper.cpp
index f99b80db382a8be6c6794db9d9e1bf333334febf..634a99fa78233615ffeed6e369808f0c4d6be541 100644 (file)
--- a/src/modules/extra/m_ldapoper.cpp
+++ b/src/modules/extra/m_ldapoper.cpp
@@ -41,9 +41,8 @@ class ModuleLDAPAuth : public Module
        LDAP *conn;
 
 public:
-       ModuleLDAPAuth(InspIRCd* Me)
-       : Module(Me)
-       {
+       ModuleLDAPAuth()
+               {
                conn = NULL;
                Implementation eventlist[] = { I_OnRehash, I_OnPassCompare };
                ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -58,7 +57,7 @@ public:
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
 
                base                    = Conf.ReadValue("ldapoper", "baserdn", 0);
                ldapserver              = Conf.ReadValue("ldapoper", "server", 0);
@@ -97,7 +96,7 @@ public:
                return true;
        }
 
-       virtual int OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+       virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
        {
                User* user = dynamic_cast<User*>(ex);
                if (hashtype == "ldap")
@@ -105,11 +104,11 @@ public:
                        if (LookupOper(user, data, input))
                        {
                                /* This is an ldap oper and has been found, claim the OPER command */
-                               return 1;
+                               return MOD_RES_DENY;
                        }
                }
                /* We don't know this oper! */
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        bool LookupOper(User* user, const std::string &what, const std::string &opassword)
@@ -179,7 +178,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR, API_VERSION);
        }
 
 };