diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index fbd8fbfcb69..3ccc9bbed48 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -154,9 +154,7 @@ $dolibarr_main_force_https="0"; # $dolibarr_main_auth_ldap_host="127.0.0.1"; # $dolibarr_main_auth_ldap_port="389"; # $dolibarr_main_auth_ldap_version="3"; -# $dolibarr_main_auth_ldap_servertype="openldap"; # openldap, activedirectory or egroupware -# -# Following parameters should not be used in LDAP connection (deprecated ?): +# $dolibarr_main_auth_ldap_servertype="openldap"; # openldap, activedirectory or egroupware # $dolibarr_main_auth_ldap_login_attribute="loginfield"; # uid or samaccountname for active directory # $dolibarr_main_auth_ldap_dn=""; # Ex: ou=users,dc=my-domain,dc=com # $dolibarr_main_auth_ldap_admin_login=""; # Required only if anonymous bind disabled diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php index 7f78e5e8541..7d13802be10 100644 --- a/htdocs/includes/login/functions_ldap.php +++ b/htdocs/includes/login/functions_ldap.php @@ -70,33 +70,6 @@ function check_user_password_ldap($usertotest,$passwordtotest) if ($ldapdebug) print "DEBUG: Logging LDAP steps
\n"; - // Debut code pour compatibilite (prend info depuis config en base) - // Ne plus utiliser. - // La config LDAP de connexion doit etre dans le fichier conf.php - /* - if (! $ldapuserattr && $conf->ldap->enabled) - { - if ($conf->global->LDAP_SERVER_TYPE == "activedirectory") - { - $ldapuserattr = $conf->global->LDAP_FIELD_LOGIN_SAMBA; - } - else - { - $ldapuserattr = $conf->global->LDAP_FIELD_LOGIN; - } - } - if (! $ldaphost) $ldaphost=$conf->global->LDAP_SERVER_HOST; - if (! $ldapport) $ldapport=$conf->global->LDAP_SERVER_PORT; - if (! $ldapservertype) $ldapservertype=$conf->global->LDAP_SERVER_TYPE; - if (! $ldapversion) $ldapversion=$conf->global->LDAP_SERVER_PROTOCOLVERSION; - if (! $ldapdn) $ldapdn=$conf->global->LDAP_SERVER_DN; - if (! $ldapadminlogin) $ldapadminlogin=$conf->global->LDAP_ADMIN_DN; - if (! $ldapadminpass) $ldapadminpass=$conf->global->LDAP_ADMIN_PASS; - */ - // Fin code pour compatiblite - - dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." admin_login=".$ldapadminlogin); - require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); $ldap=new Ldap(); $ldap->server=array($ldaphost); @@ -106,7 +79,14 @@ function check_user_password_ldap($usertotest,$passwordtotest) $ldap->searchUser=$ldapadminlogin; $ldap->searchPassword=$ldapadminpass; - if ($ldapdebug) dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword); + dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest); + if ($ldapdebug) + { + dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType); + dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ladpdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword); + print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."\n"; + print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ladpdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."\n"; + } $resultCheckUserDN=false;