From 83376283235f18fee46a3244232f9730bcaded4d Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Jun 2022 20:57:18 -0700 Subject: [PATCH 1/2] Set elvis operator to ensure ldap version is 3 if null Signed-off-by: snipe --- app/Models/Ldap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php index 14be2fd56b..935270a563 100644 --- a/app/Models/Ldap.php +++ b/app/Models/Ldap.php @@ -37,7 +37,7 @@ class Ldap extends Model public static function connectToLdap() { $ldap_host = Setting::getSettings()->ldap_server; - $ldap_version = Setting::getSettings()->ldap_version; + $ldap_version = Setting::getSettings()->ldap_version ?: 3; $ldap_server_cert_ignore = Setting::getSettings()->ldap_server_cert_ignore; $ldap_use_tls = Setting::getSettings()->ldap_tls; From 5458676eadd4a60e04f3140c2e81ebcf5d95e97a Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Jun 2022 21:00:22 -0700 Subject: [PATCH 2/2] Default to v3 of LDAP on settings save Signed-off-by: snipe --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 1bdab1bab3..d6574f17c8 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -942,7 +942,7 @@ class SettingsController extends Controller $setting->ldap_lname_field = $request->input('ldap_lname_field'); $setting->ldap_fname_field = $request->input('ldap_fname_field'); $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query'); - $setting->ldap_version = $request->input('ldap_version'); + $setting->ldap_version = $request->input('ldap_version', 3); $setting->ldap_active_flag = $request->input('ldap_active_flag'); $setting->ldap_emp_num = $request->input('ldap_emp_num'); $setting->ldap_email = $request->input('ldap_email');