summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap
diff options
context:
space:
mode:
authorblizzz <blizzz@owncloud.com>2014-03-21 11:27:18 +0100
committerblizzz <blizzz@owncloud.com>2014-03-21 11:27:18 +0100
commit3f95f9325fafc04026c697b1a4bfb471dc5e19d8 (patch)
tree7d974b9bdf489b8894e888f7d93acb972e696049 /apps/user_ldap
parentbcf388d3c5b7a7838c9b3d5eb5acdc8da501aaec (diff)
parent7c3da27bf6b0a6482e58766f0e15a012827ff130 (diff)
downloadnextcloud-server-3f95f9325fafc04026c697b1a4bfb471dc5e19d8.tar.gz
nextcloud-server-3f95f9325fafc04026c697b1a4bfb471dc5e19d8.zip
Merge pull request #7823 from owncloud/fix_7796
Add FreeIPA UUID compatibility, fixes #7796
Diffstat (limited to 'apps/user_ldap')
-rw-r--r--apps/user_ldap/lib/access.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index b7e4023dd73..4d187bab8d5 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');
foreach($testAttributes as $attribute) {
$value = $this->readAttribute($dn, $attribute);