diff --git a/htdocs/includes/pear/Auth/Container/LDAP.php b/htdocs/includes/pear/Auth/Container/LDAP.php index ba291febcda..853dc5f5f81 100644 --- a/htdocs/includes/pear/Auth/Container/LDAP.php +++ b/htdocs/includes/pear/Auth/Container/LDAP.php @@ -426,7 +426,7 @@ class Auth_Container_LDAP extends Auth_Container $attributes['count'] > 0) { $this->_debug('Saving attributes to Auth data', __LINE__); - $this->_auth_obj->setAuthData('attributes', $attributes); + DOLIAUTH::setAuthData('attributes', $attributes); } } @ldap_free_result($result_id); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0239a0f3098..8c470c63874 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -311,8 +311,8 @@ if (! session_id() || ! isset($_SESSION["dol_login"])) 'basedn' => $ldapdn, 'binddn' => $ldapadminlogin, 'bindpw' => $ldapadminpass, - - 'debug' => $ldapdebug, + 'debug' => $ldapdebug, + //'attributes' => array('pwdlastset'), 'userfilter' => '' ); if ($ldapdebug) print "DEBUG: params=".join(',',$params)."
\n"; @@ -323,16 +323,16 @@ if (! session_id() || ! isset($_SESSION["dol_login"])) $result = $aDol->getAuth(); // Si deja logue avec succes, renvoie vrai, sinon effectue un redirect sur page loginfunction et renvoie false if ($result) { - // Authentification Auth OK, on va chercher le login - $login=$aDol->getUsername(); - dolibarr_syslog ("Authentification ok (en mode Pear Base LDAP)"); - } + // Authentification Auth OK, on va chercher le login + $login=$aDol->getUsername(); + dolibarr_syslog ("Authentification ok (en mode Pear Base LDAP)"); + } else { if (isset($_POST["loginfunction"])) { - // Echec authentification - dolibarr_syslog("Authentification ko (en mode Pear Base LDAP) pour '".$_POST["username"]."'"); + // Echec authentification + dolibarr_syslog("Authentification ko (en mode Pear Base LDAP) pour '".$_POST["username"]."'"); } else {