From ca595611f5d9c81a7c6437f4e013bb0ed01a0376 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Wed, 19 Mar 2014 20:30:24 +0000 Subject: [PATCH 1/2] Add FreeIPA UUID compatibility, fixes #7796 Ability to use ipauniqueid for the UUID of a user --- apps/user_ldap/lib/access.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index b7e4023dd7..70270a2523 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -1064,8 +1064,8 @@ class Access extends LDAPUtility { return true; } - //for now, supported attributes are entryUUID, nsuniqueid, objectGUID - $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid'); + //for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID + $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid', 'ipauniqueid'); foreach($testAttributes as $attribute) { $value = $this->readAttribute($dn, $attribute); From 7c3da27bf6b0a6482e58766f0e15a012827ff130 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Thu, 20 Mar 2014 20:38:06 +0000 Subject: [PATCH 2/2] Fix duplicate ipauniqueid --- apps/user_ldap/lib/access.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 70270a2523..4d187bab8d 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -1065,7 +1065,7 @@ class Access extends LDAPUtility { } //for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID - $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid', 'ipauniqueid'); + $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid'); foreach($testAttributes as $attribute) { $value = $this->readAttribute($dn, $attribute);