From bb713137fd7f14c6694ba60099cb5c3367d599ae Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sat, 3 Feb 2024 19:17:01 +1300 Subject: [PATCH] memberUid is deprecated, make member default --- config/example-config.php | 2 +- inc/drivers_ldap.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/example-config.php b/config/example-config.php index 2a11b701..1b2fc141 100644 --- a/config/example-config.php +++ b/config/example-config.php @@ -715,7 +715,7 @@ $c->admin_email = 'calendar-admin@example.com'; // "username" => "cn", // "modified" => "modifyTimestamp", // "fullname" => "cn", -// "members" => "memberUid" +// "members" => "member" // ), /* if your "members" field contains the full DN and needs to be diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php index 00ca6754..9d3cc381 100644 --- a/inc/drivers_ldap.php +++ b/inc/drivers_ldap.php @@ -505,7 +505,8 @@ function sync_LDAP_groups(){ $member_field = isset($mapping['members']) ? $mapping['members'] - : 'memberUid'; + : 'member'; + $dnfix = isset($c->authenticate_hook['config']['group_member_dnfix']) && $c->authenticate_hook['config']['group_member_dnfix'];