From b822ab599c69502762d9dc116ae236e8dac0cb51 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Mon, 8 Aug 2005 12:10:34 +0000
Subject: [PATCH] Ajout definition de la version du protocole

---
 htdocs/lib/ldap.lib.php | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php
index b16d500f89a..a7f0e610904 100644
--- a/htdocs/lib/ldap.lib.php
+++ b/htdocs/lib/ldap.lib.php
@@ -42,6 +42,11 @@ function dolibarr_ldap_connect()
 {
   $ldapconnect = ldap_connect(LDAP_SERVER_HOST,LDAP_SERVER_PORT);
   
+  if ($ldapconnect)
+    {
+      ldap_set_option($ldapconnect, LDAP_OPT_PROTOCOL_VERSION, LDAP_SERVER_PROTOCOLVERSION);
+    }
+
   return $ldapconnect;
 }
 
@@ -77,39 +82,39 @@ function dolibarr_ldap_unbind($ds)
 }
 
 /*!
-		\brief verification de la version du serveur ldap.
-		\param	ds
-		\return	version
+  \brief verification de la version du serveur ldap.
+  \param	ds
+  \return	version
 */
 
 function dolibarr_ldap_getversion($ds)
 {
-	$version = 0;
-
-	ldap_get_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
-
+  $version = 0;
+  
+  ldap_get_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
+  
   return $version;
 }
 
 /*!
-		\brief changement de la version du serveur ldap.
-		\param	ds
-		\param	version
-		\return	version
+  \brief changement de la version du serveur ldap.
+  \param	ds
+  \param	version
+  \return	version
 */
 
 
 function dolibarr_ldap_setversion($ds,$version)
 {
-	$ldapsetversion = ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
-
+  $ldapsetversion = ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
+  
   return $ldapsetversion;
 }
 
 /*!
-		\brief permet d'enlever les accents d'une chaine.
-		\param	str
-		\return	string
+  \brief permet d'enlever les accents d'une chaine.
+  \param	str
+  \return	string
 */
 
 function dolibarr_ldap_unacc($str)