summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBrent Bloxam <brent.bloxam@gmail.com>2017-02-10 10:23:13 -0500
committerBrent Bloxam <brent.bloxam@gmail.com>2017-02-10 10:23:13 -0500
commitf7b8a31d63f4728dca08ee51e5bb860b456e2792 (patch)
treea0a498a3059927999585f76ead944e3a736e5faf /apps
parentbf88060a98ce397768d4afa7935b80751e4533f8 (diff)
downloadnextcloud-server-f7b8a31d63f4728dca08ee51e5bb860b456e2792.tar.gz
nextcloud-server-f7b8a31d63f4728dca08ee51e5bb860b456e2792.zip
Update uuidAttributes list to include FreeIPA's ipauniqueid
Signed-off-by: Brent Bloxam <brent.bloxam@gmail.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/lib/Connection.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
index 92b874e7a15..becd39205bc 100644
--- a/apps/user_ldap/lib/Connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -339,7 +339,7 @@ class Connection extends LDAPUtility {
$this->configuration->$effectiveSetting = $uuidOverride;
} else {
$uuidAttributes = array('auto', 'entryuuid', 'nsuniqueid',
- 'objectguid', 'guid');
+ 'objectguid', 'guid', 'ipauniqueid');
if(!in_array($this->configuration->$effectiveSetting,
$uuidAttributes)
&& (!is_null($this->configID))) {