clean this up now Brain says it works :)

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

diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index 1657a904a79a6b6d74dd52fe48b143c5de590ca9..e32f8cfd0fd7f4cf25ceddd9a094e33d680183d5 100644 (file)
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -26,8 +26,6 @@
 #include "channels.h"
 #include "modules.h"
 
-/* FIXME */
-#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 /* $ModDesc: Allow/Deny connections based upon answer from LDAP server */
@@ -57,7 +55,7 @@ public:
        virtual ~ModuleLDAPAuth()
        {
                if (conn)
-                       ldap_unbind_s(conn);
+                       ldap_unbind_ext(conn, NULL, NULL);
        }
 
        virtual void OnRehash(User* user, const std::string &parameter)
@@ -84,7 +82,7 @@ public:
        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)
@@ -100,7 +98,7 @@ public:
                {
                        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;
                }
@@ -131,17 +129,18 @@ public:
 
                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));
@@ -161,7 +160,8 @@ public:
                        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");
@@ -197,4 +197,3 @@ public:
 };
 
 MODULE_INIT(ModuleLDAPAuth)
-