aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2012-06-06 12:29:48 +0200
committerArthur Schiwon <blizzz@owncloud.com>2012-06-06 12:31:22 +0200
commit48ccfa42d39836fb3fdcd212a7d71a08b65f6c41 (patch)
tree1731d17a0fcc0ec66a69533ee39fe120e06596db
parent517bd28940ec94036651baf1f811d22dd4c46295 (diff)
downloadnextcloud-server-48ccfa42d39836fb3fdcd212a7d71a08b65f6c41.tar.gz
nextcloud-server-48ccfa42d39836fb3fdcd212a7d71a08b65f6c41.zip
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
-rw-r--r--apps/user_ldap/lib_ldap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index b900a67ec31..f6942ad326e 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -530,7 +530,7 @@ class OC_LDAP {
static private function sanitizeDN($dn) {
//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
- $dn = preg_replace('/,\s+/',',',$dn);
+ $dn = preg_replace('/([^\\\]),(\s+)/','\1,',$dn);
//make comparisons and everything work
$dn = strtolower($dn);