michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-18 12:32:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use text function in miniserv.pl http://virtualmin.com/node/33257

Browse Source
This commit is contained in:
Jamie Cameron
2014-05-22 09:44:50 -07:00
parent 681fe116bb
commit e99250fb68
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
miniserv.pl
View File

@@ -4743,7 +4743,7 @@ if ($proto eq "mysql") {
$cstr .= ";port=$port" if ($port);
print DEBUG "connect_userdb: Connecting to MySQL $cstr as $user\n";
my $dbh = $drh->connect($cstr, $user, $pass, { });
$dbh || return &text('sql_emysqlconnect', $drh->errstr);
$dbh || return "Failed to connect to MySQL : ".$drh->errstr;
print DEBUG "connect_userdb: Connected OK\n";
return wantarray ? ($dbh, $proto, $prefix, $args) : $dbh;
}
@@ -4756,7 +4756,7 @@ elsif ($proto eq "postgresql") {
$cstr .= ";port=$port" if ($port);
print DEBUG "connect_userdb: Connecting to PostgreSQL $cstr as $user\n";
my $dbh = $drh->connect($cstr, $user, $pass);
$dbh || return &text('sql_epostgresqlconnect', $drh->errstr);
$dbh || return "Failed to connect to PostgreSQL : ".$drh->errstr;
print DEBUG "connect_userdb: Connected OK\n";
return wantarray ? ($dbh, $proto, $prefix, $args) : $dbh;
}
@@ -4772,14 +4772,14 @@ elsif ($proto eq "ldap") {
my $ldap = Net::LDAP->new($host,
port => $port,
'scheme' => $scheme);
$ldap || return &text('sql_eldapconnect', $host);
$ldap || return "Failed to connect to LDAP : ".$host;
my $mesg;
if ($args->{'tls'}) {
# Switch to TLS mode
eval { $mesg = $ldap->start_tls(); };
if ($@ || !$mesg || $mesg->code) {
return &text('sql_eldaptls',
$@ ? $@ : $mesg ? $mesg->error : "Unknown error");
return "Failed to switch to LDAP TLS mode : ".
($@ ? $@ : $mesg ? $mesg->error : "Unknown error");
}
}
# Login to the server
@@ -4790,8 +4790,8 @@ elsif ($proto eq "ldap") {
$mesg = $ldap->bind(dn => $user, anonymous => 1);
}
if (!$mesg || $mesg->code) {
return &text('sql_eldaplogin', $user,
$mesg ? $mesg->error : "Unknown error");
return "Failed to login to LDAP as ".$user." : ".
($mesg ? $mesg->error : "Unknown error");
}
return wantarray ? ($ldap, $proto, $prefix, $args) : $ldap;
}