From 7b2d2cf357d170700f1d167ce05632659807b947 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 12 Jun 2006 12:48:43 +0000
Subject: [PATCH] =?UTF-8?q?d=E9but=20am=E9lioration=20LDAP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/ldap.php   | 2 +-
 htdocs/lib/ldap.lib.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index fad7b670d55..13ec3c5d364 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -274,7 +274,7 @@ if (function_exists("ldap_connect"))
 			print img_picto('','alerte');
 			print $langs->trans("LDAPTestKO").'<br>';
 			print "<br>";
-			print ldap_error($ds);
+			print $ds->err;
 			print "<br>";
 		}
 
diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php
index d33eb81478c..203e1d375ff 100644
--- a/htdocs/lib/ldap.lib.php
+++ b/htdocs/lib/ldap.lib.php
@@ -58,6 +58,10 @@ function dolibarr_ldap_connect()
 	{
 		ldap_set_option($ldapconnect, LDAP_OPT_PROTOCOL_VERSION, $conf->global->LDAP_SERVER_PROTOCOLVERSION);
 	}
+	else
+	{
+		$this->err .= ldap_error($ldapconnect);
+	}
 	
 	return $ldapconnect;
 }