Commit be0f999f authored by Yadd's avatar Yadd
Browse files

Merge branch 'v1.9' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng into v1.9

parents 82bff2b2 b3952f89
......@@ -261,7 +261,7 @@ sub tests {
if ($@);
# Create SMTP object
my $smtp = Net::SMTP->new( $conf->{SMTPServer} );
my $smtp = Net::SMTP->new( $conf->{SMTPServer}, Timeout => 5 );
return ( 1,
"SMTP connection to " . $conf->{SMTPServer} . " failed" )
unless ($smtp);
......
......@@ -461,7 +461,7 @@ sub checkTokenResponseValidity {
my ( $self, $json ) = @_;
# token_type MUST be Bearer
unless ( $json->{token_type} eq "Bearer" ) {
unless ( $json->{token_type} =~ /^Bearer$/i ) {
$self->lmLog(
"Token type is " . $json->{token_type} . " but must be Bearer",
'error' );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment