summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-02-13 06:59:16 -0800
committerLukas Reschke <lukas@statuscode.ch>2013-02-13 06:59:16 -0800
commit4f38b543b0a1e34bd8bdf0ce9ade9f1878d63f67 (patch)
tree5093a65ee9a963051fa4af1db92a26a9bed49b74
parent5a0a9564ce98938401b276d634caab48f788fff3 (diff)
parent1e45453da2d5e10014966888e5e994c5acd9e61e (diff)
downloadnextcloud-server-4f38b543b0a1e34bd8bdf0ce9ade9f1878d63f67.tar.gz
nextcloud-server-4f38b543b0a1e34bd8bdf0ce9ade9f1878d63f67.zip
Merge pull request #1665 from owncloud/fix_ldap_1605
LDAP: format dn before using it, not other way round. fixes #1605
-rw-r--r--apps/user_ldap/lib/access.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 057ae17c308..4aa8ae8e8a4 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -57,8 +57,8 @@ abstract class Access {
\OCP\Util::writeLog('user_ldap', 'LDAP resource not available.', \OCP\Util::DEBUG);
return false;
}
- $rr = @ldap_read($cr, $dn, $filter, array($attr));
$dn = $this->DNasBaseParameter($dn);
+ $rr = @ldap_read($cr, $dn, $filter, array($attr));
if(!is_resource($rr)) {
\OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG);
//in case an error occurs , e.g. object does not exist