From c4c28930d5edba400151272a1acffa011bd36b15 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 14 Sep 2006 08:29:02 +0000
Subject: [PATCH] Tracer l'initialisation du LAP (aide au ticker #569)
---
ecrire/inc/install_ldap2.php | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/ecrire/inc/install_ldap2.php b/ecrire/inc/install_ldap2.php
index 6cf7533b73..a0eb6e1008 100644
--- a/ecrire/inc/install_ldap2.php
+++ b/ecrire/inc/install_ldap2.php
@@ -22,20 +22,26 @@ function inc_install_ldap2()
echo "<P>";
- $ldap_link = @ldap_connect($adresse_ldap, $port_ldap);
+ $port_ldap = intval($port_ldap);
+ $ldap_link = ldap_connect($adresse_ldap, $port_ldap);
+ $erreur = "ldap_connect($adresse_ldap, $port_ldap)";
if ($ldap_link) {
- if ( !@ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, $protocole_ldap) ) {
+ if ( !ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, $protocole_ldap) ) {
$protocole_ldap = 2 ;
- @ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, $protocole_ldap);
+ ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, $protocole_ldap);
}
if ($tls_ldap == 'oui') {
- if (!ldap_start_tls($ldap_link))
+ if (!ldap_start_tls($ldap_link)) {
+ $erreur = "ldap_start_tls($ldap_link) $adresse_ldap, $port_ldap";
$ldap_link = false;
+ }
+ }
+ if ($ldap_link) {
+ $ldap_link = ldap_bind($ldap_link, $login_ldap, $pass_ldap);
+ $erreur = "ldap_bind('$ldap_link', '$login_ldap', '$pass_ldap'): $adresse_ldap, $port_ldap";
}
- if ($ldap_link)
- $ldap_link = @ldap_bind($ldap_link, $login_ldap, $pass_ldap);
}
if ($ldap_link) {
@@ -57,6 +63,7 @@ function inc_install_ldap2()
echo "<B>"._T('avis_connexion_ldap_echec_1')."</B>";
echo "<P>"._T('avis_connexion_ldap_echec_2');
echo "<br />\n"._T('avis_connexion_ldap_echec_3');
+ echo '<br /><br />', $erreur, '<b> ?</b>';
}
install_fin_html();
--
GitLab