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 f40f986562e57e0fc5b9ca607cec77be148e54e8..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 */
@@ -131,7 +129,6 @@ 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)
                {       
@@ -143,8 +140,7 @@ public:
                }
                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, NULL, &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));
@@ -164,7 +160,6 @@ 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)
                {