[Pkg-owncloud-commits] [owncloud] 65/134: Add FreeIPA UUID compatibility, fixes #7796

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 540d4af8a7a5c2efae2d11fe8cdc415e7dad7670
Author: Robin McCorkell <rmccorkell at karoshi.org.uk>
Date:   Wed Mar 19 20:30:24 2014 +0000

    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 45a8799..51221d0 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1035,8 +1035,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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git