michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix try-again for SSL

Browse Source
This commit is contained in:
Jamie Cameron
2008-08-06 21:00:51 +00:00
parent f6c31370cc
commit f735ca1748
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ldap-server/ldap-server-lib.pl
View File

@@ -69,6 +69,7 @@ local $ldap;
foreach $ssl (@ssls) {
$ldap = Net::LDAP->new($server, port => $port);
if (!$ldap) {
# Connection failed .. give up completely
return &text('connect_eldap', "<tt>$server</tt>", $port);
}
if ($ssl) {
@@ -76,11 +77,15 @@ foreach $ssl (@ssls) {
local $mesg;
eval { $mesg = $ldap->start_tls(); };
if ($@ || !$mesg || $mesg->code) {
next if (@ssls); # Try non-SSL
}
else {
return &text('connect_essl', "<tt>$server</tt>",
$@ ? %@ : &ldap_error($mesg));
# Failed to switch to SSL mode. If also trying non-SSL,
# continue around the loop. Otherwise, give up
if (@ssls > 1) {
next;
}
else {
return &text('connect_essl', "<tt>$server</tt>",
$@ ? $@ : &ldap_error($mesg));
}
}
}
}