From 37d3847e418122c3d360421edeaa3b30565a9d63 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 29 May 2007 19:30:35 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20on=20ne=20pouvait=20pas=20r=E9cup=E9rer?=
 =?UTF-8?q?=20d'attribut=20suppl=E9mentaire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/pear/Auth/Container/LDAP.php |  2 +-
 htdocs/main.inc.php                          | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

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)."<br>\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 
 	        {