lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11964 from hregis/8.0_mc2

Browse Source 
FIX getObjectSid is only for Active Directory
This commit is contained in:
Laurent Destailleur 2019-09-27 11:25:14 +02:00 committed by GitHub
commit 148afcaca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/login/functions_ldap.php
View File

@ -166,9 +166,13 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n"; if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n";
if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n"; if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n";
// On recherche le user dolibarr en fonction de son SID ldap // On recherche le user dolibarr en fonction de son SID ldap (only for Active Directory)
$sid = $ldap->getObjectSid($login); $sid = null;
if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n"; if ($conf->global->LDAP_SERVER_TYPE == "activedirectory")
{
$sid = $ldap->getObjectSid($login);
if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
}
$usertmp=new User($db); $usertmp=new User($db);
$resultFetchUser=$usertmp->fetch('', $login, $sid); $resultFetchUser=$usertmp->fetch('', $login, $sid);