From 9643ef3f6f5cad51d6c30e3e4ced2d603c6fc921 Mon Sep 17 00:00:00 2001 From: viharm Date: Mon, 14 Mar 2022 17:11:51 +0000 Subject: [PATCH 1/3] Added additional parameter passed to LDAP auth module for checking existing user data in DB --- src/psm/Service/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Service/User.php b/src/psm/Service/User.php index abf4c0e2..1440d650 100644 --- a/src/psm/Service/User.php +++ b/src/psm/Service/User.php @@ -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)); } } From 59966c6cd271a2519e24cad4fc4e6a2309f9371b Mon Sep 17 00:00:00 2001 From: Viharm Date: Sun, 13 Aug 2023 18:52:19 +0000 Subject: [PATCH 2/3] Signed commit --- src/psm/Service/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Service/User.php b/src/psm/Service/User.php index 1440d650..ebe9077c 100644 --- a/src/psm/Service/User.php +++ b/src/psm/Service/User.php @@ -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, $this->getUserByUsername($user_name)); + $ldapauthstatus = psmldapauth($user_name, $user_password, $GLOBALS['sm_config'], $this->db_connection, $this->getUserByUsername($user_name)); } } From 61afb81554f70bed6c49d5c6411023d60583d6d7 Mon Sep 17 00:00:00 2001 From: Viharm Date: Mon, 14 Aug 2023 05:43:24 +0000 Subject: [PATCH 3/3] Cleanup --- src/psm/Service/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Service/User.php b/src/psm/Service/User.php index ebe9077c..1440d650 100644 --- a/src/psm/Service/User.php +++ b/src/psm/Service/User.php @@ -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, $this->getUserByUsername($user_name)); + $ldapauthstatus = psmldapauth($user_name, $user_password, $GLOBALS['sm_config'], $this->db_connection, $this->getUserByUsername($user_name)); } }