From df9e5665a96c39e541a188ea28cc758d3fe26123 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Fri, 19 Dec 2008 15:18:16 +0000
Subject: [PATCH] C'est pas le tout de demander le Samaccountname, encore
faut-il le lire (Samuel Ruet).
---
ecrire/auth/ldap.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ecrire/auth/ldap.php b/ecrire/auth/ldap.php
index e9444be0cd..4d0e2aae64 100644
--- a/ecrire/auth/ldap.php
+++ b/ecrire/auth/ldap.php
@@ -84,8 +84,10 @@ function auth_ldap_inserer($dn, $statut)
$result = @ldap_read($ldap_link, $dn, "objectClass=*", array("uid", "cn", "mail", "description"));
// Si ça ne marche pas, essayer avec le samaccountname
- if (!$result)
+ if (!$result) {
$result = @ldap_read($ldap_link, $dn, "objectClass=*", array("samaccountname", "cn", "mail", "description"));
+ $uid = 'samaccountname';
+ } else $uid = 'uid';
if (!$result) return array();
@@ -97,7 +99,7 @@ function auth_ldap_inserer($dn, $statut)
if (is_array($val)) {
if (!$nom) $nom = $val['cn'][0];
if (!$email) $email = $val['mail'][0];
- if (!$login) $login = $val['uid'][0];
+ if (!$login) $login = $val[$uid][0];
if (!$bio) $bio = $val['description'][0];
}
}
--
GitLab