Compare commits

...

6 Commits

Author SHA1 Message Date
Tim Zandbergen fccc264107
Merge pull request #1183 from viharm/fix/DBUserDetailRetention-LDAP
Retain user data in DB for existing users
2023-08-14 21:31:43 +02:00
Viharm 61afb81554
Cleanup 2023-08-14 05:43:24 +00:00
Viharm 537b17ac01
Merge branch 'phpservermon:develop' into fix/DBUserDetailRetention-LDAP 2023-08-14 06:34:37 +01:00
Viharm 59966c6cd2
Signed commit 2023-08-13 18:52:19 +00:00
Viharm c81a4a426c
Merge branch 'phpservermon:develop' into fix/DBUserDetailRetention-LDAP 2023-08-10 15:01:35 +01:00
viharm 9643ef3f6f
Added additional parameter passed to LDAP auth module for checking existing user data in DB 2022-03-14 17:11:51 +00:00
1 changed files with 1 additions and 1 deletions

View File

@ -252,7 +252,7 @@ class User
// Delegate the authentication to the PsmLDAPauth module.
// If LDAP auth fails or if library not found, fall back to native auth
include_once($ldaplibpath);
$ldapauthstatus = psmldapauth($user_name, $user_password, $GLOBALS['sm_config'], $this->db_connection);
$ldapauthstatus = psmldapauth($user_name, $user_password, $GLOBALS['sm_config'], $this->db_connection, $this->getUserByUsername($user_name));
}
}