diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-02-15 08:07:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 08:07:58 -0600 |
| commit | 52ef851da32be72dcf7b2a0c7e1386581f9dfda6 (patch) | |
| tree | f48ea02cc9854d8b1437d910fe621b5f4ca6db9f /apps | |
| parent | cd49eb36e89da28cad56854eb60a5a6d031aedb4 (diff) | |
| parent | f7b8a31d63f4728dca08ee51e5bb860b456e2792 (diff) | |
| download | nextcloud-server-52ef851da32be72dcf7b2a0c7e1386581f9dfda6.tar.gz nextcloud-server-52ef851da32be72dcf7b2a0c7e1386581f9dfda6.zip | |
Merge pull request #3421 from espro/freeipa-uuid-fix
Update uuidAttributes list to include FreeIPA's ipauniqueid
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/lib/Connection.php | 2 |
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))) { |