#include "channels.h"
#include "modules.h"
-/* FIXME */
-#define LDAP_DEPRECATED 1
#include <ldap.h>
/* $ModDesc: Allow/Deny connections based upon answer from LDAP server */
virtual ~ModuleLDAPAuth()
{
if (conn)
- ldap_unbind_s(conn);
+ ldap_unbind_ext(conn, NULL, NULL);
}
virtual void OnRehash(User* user, const std::string ¶meter)
bool Connect()
{
if (conn != NULL)
- ldap_unbind_s(conn);
+ ldap_unbind_ext(conn, NULL, NULL);
int res, v = LDAP_VERSION3;
res = ldap_initialize(&conn, ldapserver.c_str());
if (res != LDAP_SUCCESS)
{
if (verbose)
ServerInstance->SNO->WriteToSnoMask('A', "LDAP set protocol to v3 failed: %s", ldap_err2string(res));
- ldap_unbind_s(conn);
+ ldap_unbind_ext(conn, NULL, NULL);
conn = NULL;
return false;
}
int res;
// bind anonymously
- if ((res = ldap_simple_bind_s(conn, "", "")) != LDAP_SUCCESS)
+ struct berval cred; cred.bv_val = ""; cred.bv_len = 0;
+ if ((res = ldap_sasl_bind_s(conn, "", LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) != LDAP_SUCCESS)
{
if (verbose)
ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (LDAP bind anonymously failed: %s)", user->nick, user->ident, user->host, ldap_err2string(res));
- ldap_unbind_s(conn);
+ ldap_unbind_ext(conn, NULL, NULL);
conn = NULL;
return false;
}
LDAPMessage *msg, *entry;
std::string what = (attribute + "=" + user->nick);
- if ((res = ldap_search_s(conn, base.c_str(), searchscope, what.c_str(), NULL, 0, &msg)) != LDAP_SUCCESS)
+ 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));
ldap_msgfree(msg);
return false;
}
- if ((res = ldap_simple_bind_s(conn, ldap_get_dn(conn, entry), user->password)) == LDAP_SUCCESS)
+ cred.bv_val = user->password; cred.bv_len = strlen(user->password);
+ if ((res = ldap_sasl_bind_s(conn, ldap_get_dn(conn, entry), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) == LDAP_SUCCESS)
{
ldap_msgfree(msg);
user->Extend("ldapauthed");
virtual Version GetVersion()
{
- return Version(4,0,0,0,VF_VENDOR,API_VERSION);
+ return Version(1,2,0,0,VF_VENDOR,API_VERSION);
}
};
MODULE_INIT(ModuleLDAPAuth)
-