X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ldapauth.cpp;h=93ca34ff2dc0794f07ba54866ccf58f36f68a0f6;hb=813bc55a8496875cef52e6da42d608e4d2fa35da;hp=7de157601fdd26ac0fea2ed98af1e168a8a18740;hpb=6004b582ce3997daa11ab5b9d0a8f2346cebc3e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index 7de157601..93ca34ff2 100644
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -42,6 +42,7 @@ class ModuleLDAPAuth : public Module
 	std::string password;
 	int searchscope;
 	bool verbose;
+	bool useusername;
 	LDAP *conn;
 	
 public:
@@ -73,6 +74,7 @@ public:
 		username		= Conf.ReadValue("ldapauth", "binddn", 0);
 		password		= Conf.ReadValue("ldapauth", "bindauth", 0);
 		verbose			= Conf.ReadFlag("ldapauth", "verbose", 0);		/* Set to true if failed connects should be reported to operators */
+		useusername		= Conf.ReadFlag("ldapauth", "userfield", 0);
 		
 		if (scope == "base")
 			searchscope = LDAP_SCOPE_BASE;
@@ -119,7 +121,7 @@ public:
 
 		if (!CheckCredentials(user))
 		{
-			User::QuitUser(ServerInstance,user,killreason);
+			ServerInstance->Users->QuitUser(user, killreason);
 			return 1;
 		}
 		return 0;
@@ -142,7 +144,7 @@ public:
 		{
 			free(authpass);
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP bind failed: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP bind failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), ldap_err2string(res));
 			ldap_unbind_ext(conn, NULL, NULL);
 			conn = NULL;
 			return false;
@@ -150,29 +152,29 @@ public:
 		free(authpass);
 
 		LDAPMessage *msg, *entry;
-		std::string what = (attribute + "=" + user->nick);
+		std::string what = (attribute + "=" + (useusername ? user->ident : user->nick));
 		if ((res = ldap_search_ext_s(conn, base.c_str(), searchscope, what.c_str(), NULL, 0, NULL, NULL, NULL, 0, &msg)) != LDAP_SUCCESS)
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search failed: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), ldap_err2string(res));
 			return false;
 		}
 		if (ldap_count_entries(conn, msg) > 1)
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search returned more than one result: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search returned more than one result: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), ldap_err2string(res));
 			ldap_msgfree(msg);
 			return false;
 		}
 		if ((entry = ldap_first_entry(conn, msg)) == NULL)
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search returned no results: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP search returned no results: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), ldap_err2string(res));
 			ldap_msgfree(msg);
 			return false;
 		}
-		cred.bv_val = user->password;
-		cred.bv_len = strlen(user->password);
+		cred.bv_val = (char*)user->password.data();
+		cred.bv_len = user->password.length();
 		if ((res = ldap_sasl_bind_s(conn, ldap_get_dn(conn, entry), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) == LDAP_SUCCESS)
 		{
 			ldap_msgfree(msg);
@@ -182,7 +184,7 @@ public:
 		else
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (%s)", user->nick, user->ident, user->host, ldap_err2string(res));
+				ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (%s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), ldap_err2string(res));
 			ldap_msgfree(msg);
 			user->Extend("ldapauth_failed");
 			return false;