Merge pull request #118 from ulsdevteam/ldap-fatal-error-disconnect

chinpei215 · web-flow · commit f1425d39219a · 2017-10-25T10:06:21.000+09:00
LdapSource: Remove call to undefined fatal_error() function
diff --git a/Model/Datasource/LdapSource.php b/Model/Datasource/LdapSource.php
@@ -252,7 +252,7 @@ public function connect($bindDN = null, $passwd = null) {
 		if ($config['tls']) {
 			if (!ldap_start_tls($this->database)) {
 				$this->log("Ldap_start_tls failed", 'ldap.error');
-				fatal_error("Ldap_start_tls failed");
+				return $this->disconnect();
 			}
 		}
 		//So little known fact, if your php-ldap lib is built against openldap like pretty much every linux

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public function connect($bindDN = null, $passwd = null) {`
`252`	`252`	`if ($config['tls']) {`
`253`	`253`	`if (!ldap_start_tls($this->database)) {`
`254`	`254`	`$this->log("Ldap_start_tls failed", 'ldap.error');`
`255`		`- fatal_error("Ldap_start_tls failed");`
	`255`	`+ return $this->disconnect();`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`	`//So little known fact, if your php-ldap lib is built against openldap like pretty much every linux`