From d68383340b5abd675c72df325064601405262d4c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 4 Jan 2008 22:14:20 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20on=20v=E9rifie=20si=20le=20user=20existe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/includes/login/functions_ldap.php | 2 +-
htdocs/lib/ldap.class.php | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php
index f9c43552559..61898d32494 100644
--- a/htdocs/includes/login/functions_ldap.php
+++ b/htdocs/includes/login/functions_ldap.php
@@ -111,7 +111,7 @@ function check_user_password_ldap($usertotest,$passwordtotest)
{
$resultFetchLdapUser = $ldap->fetch($_POST["username"]);
// On stop si le mot de passe ldap doit etre modifie sur le domaine
- if ($resultFetchLdapUser && $ldap->pwdlastset <= 0)
+ if ($resultFetchLdapUser == 1 && $ldap->pwdlastset <= 0)
{
dolibarr_syslog('functions_ldap::User '.$login.' must change password next logon');
if ($ldapdebug) print "DEBUG: User ".$login." must change password<br>\n";
diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php
index fb4aba8b978..db8ddda6bf4 100644
--- a/htdocs/lib/ldap.class.php
+++ b/htdocs/lib/ldap.class.php
@@ -900,6 +900,7 @@ class Ldap
if (! $result)
{
$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
+ return -1;
}
else
{
@@ -916,6 +917,7 @@ class Ldap
$this->badpwdtime = $this->convert_time($this->ldap_utf8_decode($result[0]["badpasswordtime"][0]));
ldap_free_result($this->result);
+ return 1;
}
}
--
GitLab