diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2015-04-09 21:04:33 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2015-04-09 21:05:20 +0200 |
| commit | 60bf934e6fef156da4fdd008e137dfe6bc423d8f (patch) | |
| tree | 86fc01518b685aef4f9bb80cef08d74fc2db7b06 /apps/user_ldap | |
| parent | a8b831b01860ac043ee615662d883432e263af32 (diff) | |
| download | nextcloud-server-60bf934e6fef156da4fdd008e137dfe6bc423d8f.tar.gz nextcloud-server-60bf934e6fef156da4fdd008e137dfe6bc423d8f.zip | |
change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/configuration.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/wizard.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php index 4621297595d..373c5b48417 100644 --- a/apps/user_ldap/lib/configuration.php +++ b/apps/user_ldap/lib/configuration.php @@ -377,7 +377,7 @@ class Configuration { 'ldap_groupfilter_groups' => '', 'ldap_display_name' => 'displayName', 'ldap_group_display_name' => 'cn', - 'ldap_tls' => 1, + 'ldap_tls' => 0, 'ldap_nocase' => 0, 'ldap_quota_def' => '', 'ldap_quota_attr' => '', diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index eaec3581981..7bb5752352f 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -165,6 +165,9 @@ class Wizard extends LDAPUtility { public function countInBaseDN() { // we don't need to provide a filter in this case $total = $this->countEntries(null, 'objects'); + if($total === false) { + throw new \Exception('invalid results received'); + } $this->result->addChange('ldap_test_base', $total); return $this->result; } |