mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3421 from espro/freeipa-uuid-fix 

Update uuidAttributes list to include FreeIPA's ipauniqueid
This commit is contained in:
Morris Jobke 2017-02-15 08:07:58 -06:00 committed by GitHub
parent cd49eb36e8 f7b8a31d63
commit 52ef851da3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/lib/Connection.php
View File

@ -339,7 +339,7 @@ class Connection extends LDAPUtility {
$this->configuration->$effectiveSetting = $uuidOverride; $this->configuration->$effectiveSetting = $uuidOverride;
} else { } else {
$uuidAttributes = array('auto', 'entryuuid', 'nsuniqueid', $uuidAttributes = array('auto', 'entryuuid', 'nsuniqueid',
'objectguid', 'guid'); 'objectguid', 'guid', 'ipauniqueid');
if(!in_array($this->configuration->$effectiveSetting, if(!in_array($this->configuration->$effectiveSetting,
$uuidAttributes) $uuidAttributes)
&& (!is_null($this->configID))) { && (!is_null($this->configID))) {