WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed TLS error handling

This commit is contained in:
Roland Gruber 2004-05-23 08:16:38 +00:00
parent 61daf2e6cf
commit 75a77db5b2
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lam-0.4/HISTORY
View File

@ -1,9 +1,10 @@
??? 0.4.6 26.05.2004 0.4.6
- fixed bugs: - fixed bugs:
password hashes were not disabled correctly password hashes were not disabled correctly
street was copied to postal code on modify (938502) street was copied to postal code on modify (938502)
underscore was not allowed for host names (934445) underscore was not allowed for host names (934445)
deleting postal address or facsimile number failed (948616) deleting postal address or facsimile number failed (948616)
TLS error handling (958497)
smaller fixes on personal settings page smaller fixes on personal settings page

2
lam-0.4/lib/ldap.inc
View File

@ -266,7 +266,7 @@ class Ldap{
if (function_exists('ldap_start_tls')) { if (function_exists('ldap_start_tls')) {
@ldap_start_tls($this->server); @ldap_start_tls($this->server);
// connect without TLS if it failed // connect without TLS if it failed
if (ldap_errno($this->server) > 0) { if (ldap_errno($this->server) != 0) {
@ldap_close($this->server); @ldap_close($this->server);
$this->server = @ldap_connect($this->conf->get_ServerURL()); $this->server = @ldap_connect($this->conf->get_ServerURL());
ldap_set_option($this->server, LDAP_OPT_PROTOCOL_VERSION, 3); ldap_set_option($this->server, LDAP_OPT_PROTOCOL_VERSION, 3);

2
lam/lib/ldap.inc
View File

@ -266,7 +266,7 @@ class Ldap{
if (function_exists('ldap_start_tls')) { if (function_exists('ldap_start_tls')) {
@ldap_start_tls($this->server); @ldap_start_tls($this->server);
// connect without TLS if it failed // connect without TLS if it failed
if (ldap_errno($this->server) > 0) { if (ldap_errno($this->server) != 0) {
@ldap_close($this->server); @ldap_close($this->server);
$this->server = @ldap_connect($this->conf->get_ServerURL()); $this->server = @ldap_connect($this->conf->get_ServerURL());
ldap_set_option($this->server, LDAP_OPT_PROTOCOL_VERSION, 3); ldap_set_option($this->server, LDAP_OPT_PROTOCOL_VERSION, 3);