From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 9 Apr 2015 19:04:33 +0000 (+0200)
Subject: change default value of ldap_tls to 0. It will be detected anyway, but starting with... 
X-Git-Tag: v8.1.0alpha1~43^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=60bf934e6fef156da4fdd008e137dfe6bc423d8f;p=nextcloud-server.git

change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability
---

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;
 	}