From 2a30a9646cb4db0f4c1d974520da888bec78145f Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sat, 3 Feb 2024 20:06:38 +1300 Subject: [PATCH] Have some sane defaults for LDAP group mappings --- inc/drivers_ldap.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php index 944fbc7b..e269b1f5 100644 --- a/inc/drivers_ldap.php +++ b/inc/drivers_ldap.php @@ -506,14 +506,18 @@ function sync_LDAP_groups(){ unset($mapping['username']); } + // Set sane defaults. + if (! isset($mapping['name'])) + $mapping['name'] = 'cn'; + if (! isset($mapping['members'])) + $mapping['members'] = 'member'; + $attributes = array_values_mapping($mapping); $ldap_groups_tmp = $ldapDriver->getAllGroups($attributes); if ( sizeof($ldap_groups_tmp) == 0 ) return; - $member_field = isset($mapping['members']) - ? $mapping['members'] - : 'member'; + $member_field = $mapping['members']; $dnfix = isset($c->authenticate_hook['config']['group_member_dnfix']) && $c->authenticate_hook['config']['group_member_dnfix'];