summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib/configuration.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-12-06 18:27:46 +0100
committerRobin Appelman <icewind@owncloud.com>2013-12-06 18:27:46 +0100
commit9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc (patch)
tree082f05cc105e5540c6ef642d9b3d6daaa64fd749 /apps/user_ldap/lib/configuration.php
parente888bdda30589d4d8c20bca3c1f962436794bf10 (diff)
parentb5939324b0053b6447423ebc8b269e9f773f7f02 (diff)
downloadnextcloud-server-9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc.tar.gz
nextcloud-server-9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc.zip
Merge branch 'master' into backgroundscan-reuse-etag
Diffstat (limited to 'apps/user_ldap/lib/configuration.php')
-rw-r--r--apps/user_ldap/lib/configuration.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index c396d5b4bf8..874082f78f6 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -308,7 +308,7 @@ class Configuration {
'ldap_user_filter_mode' => 0,
'ldap_userfilter_objectclass' => '',
'ldap_userfilter_groups' => '',
- 'ldap_login_filter' => 'uid=%uid',
+ 'ldap_login_filter' => '',
'ldap_login_filter_mode' => 0,
'ldap_loginfilter_email' => 0,
'ldap_loginfilter_username' => 1,