X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ldapoper.cpp;h=45f03aa8ef6c6df4e5c441c554af1377996583af;hb=2552786a2fbed628e7d51a6b8e177981b1ff8d40;hp=68e7ffc28bfcbbcfda166ed499ceb92ada40f485;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ldapoper.cpp b/src/modules/extra/m_ldapoper.cpp
index 68e7ffc28..45f03aa8e 100644
--- a/src/modules/extra/m_ldapoper.cpp
+++ b/src/modules/extra/m_ldapoper.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -41,13 +41,12 @@ 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);
-		OnRehash(NULL,"");
+		OnRehash(NULL);
 	}
 
 	virtual ~ModuleLDAPAuth()
@@ -56,9 +55,9 @@ public:
 			ldap_unbind_ext(conn, NULL, NULL);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 
 		base 			= Conf.ReadValue("ldapoper", "baserdn", 0);
 		ldapserver		= Conf.ReadValue("ldapoper", "server", 0);
@@ -97,22 +96,21 @@ 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")
 		{
-			if (LookupOper(user, data, input))
-			{
+			if (LookupOper(data, input))
 				/* This is an ldap oper and has been found, claim the OPER command */
-				return 1;
-			}
+				return MOD_RES_ALLOW;
+			else
+				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)
+	bool LookupOper(const std::string &what, const std::string &opassword)
 	{
 		if (conn == NULL)
 			if (!Connect())
@@ -127,10 +125,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);
 
@@ -168,7 +177,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);
 	}
 
 };