Add initial query support to m_mysql [patch by Athenon]

[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 79cc9aca44756b8e139341ab0a3a8838b4512cf2..46b6cbcb25a4b396116c0f6b5c251904137f064b 100644 (file)
--- a/src/modules/extra/m_ldapoper.cpp
+++ b/src/modules/extra/m_ldapoper.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -42,12 +42,12 @@ class ModuleLDAPAuth : public Module
 
 public:
        ModuleLDAPAuth(InspIRCd* Me)
-       : Module::Module(Me)
+       : Module(Me)
        {
                conn = NULL;
                Implementation eventlist[] = { I_OnRehash, I_OnPassCompare };
                ServerInstance->Modules->Attach(eventlist, this, 2);
-               OnRehash(NULL,"");
+               OnRehash(NULL);
        }
 
        virtual ~ModuleLDAPAuth()
@@ -56,7 +56,7 @@ public:
                        ldap_unbind_ext(conn, NULL, NULL);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ConfigReader Conf(ServerInstance);
 
@@ -97,7 +97,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 +105,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)
@@ -127,10 +127,21 @@ public:
 
                if ((res = ldap_sasl_bind_s(conn, username.c_str(), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) != LDAP_SUCCESS)
                {
-                       free(authpass);
-                       ldap_unbind_ext(conn, NULL, NULL);
-                       conn = NULL;
-                       return false;
+                       if (res == LDAP_SERVER_DOWN)
+                       {
+                               // Attempt to reconnect if the connection dropped
+                               ServerInstance->SNO->WriteToSnoMask('a', "LDAP server has gone away - reconnecting...");
+                               Connect();
+                               res = ldap_sasl_bind_s(conn, username.c_str(), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL);
+                       }
+
+                       if (res != LDAP_SUCCESS)
+                       {
+                               free(authpass);
+                               ldap_unbind_ext(conn, NULL, NULL);
+                               conn = NULL;
+                               return false;
+                       }
                }
                free(authpass);