diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-12-13 13:37:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-13 13:37:08 +0100 |
| commit | a3120d428bf0b94bcbf2ea92a82cedcfe1397fa7 (patch) | |
| tree | 1e556ae91d33b4fd2adbfb76715c31c30b44e108 | |
| parent | fc30e7a6c6570c89c3817d5da683fde867d98ac4 (diff) | |
| parent | defac0ff0d13c759b70504cf16c0d51b4d36ee1e (diff) | |
| download | nextcloud-server-a3120d428bf0b94bcbf2ea92a82cedcfe1397fa7.tar.gz nextcloud-server-a3120d428bf0b94bcbf2ea92a82cedcfe1397fa7.zip | |
Merge pull request #7479 from nextcloud/fix-7400
Fixes bin2hex() in LDAP
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 95710cd37f2..27fda38a737 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -1253,11 +1253,13 @@ class Access extends LDAPUtility implements IUserTools { unset($item[$key]['count']); } if($key !== 'dn') { - $selection[$i][$key] = $this->resemblesDN($key) ? - $this->helper->sanitizeDN($item[$key]) - : $key === 'objectguid' || $key === 'guid' ? - $selection[$i][$key] = $this->convertObjectGUID2Str($item[$key]) - : $item[$key]; + if($this->resemblesDN($key)) { + $selection[$i][$key] = $this->helper->sanitizeDN($item[$key]); + } else if($key === 'objectguid' || $key === 'guid') { + $selection[$i][$key] = [$this->convertObjectGUID2Str($item[$key][0])]; + } else { + $selection[$i][$key] = $item[$key]; + } } else { $selection[$i][$key] = [$this->helper->sanitizeDN($item[$key])]; } |