Merge branch 'master' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng

This commit is contained in:
Christophe Maudoux 2018-06-13 23:06:37 +02:00
commit 9d4525324e
4 changed files with 13 additions and 12 deletions

View File

@ -74,7 +74,7 @@ sub run {
$self->logger->debug("TOTP name : $TOTPName"); $self->logger->debug("TOTP name : $TOTPName");
unless ($code) { unless ($code) {
$self->logger->userInfo('TOTP registration: empty validation form'); $self->userLogger->info('TOTP registration: empty validation form');
return $self->p->sendError( $req, 'missingCode', 200 ); return $self->p->sendError( $req, 'missingCode', 200 );
} }

View File

@ -58,7 +58,7 @@ sub extractFormInfo {
# 1. Verify SSL exchange # 1. Verify SSL exchange
unless ( $req->{SSL_CLIENT_S_DN} ) { unless ( $req->{SSL_CLIENT_S_DN} ) {
$self->userlogger->warn( 'No certificate found for ' . $req->address ); $self->userLogger->warn( 'No certificate found for ' . $req->address );
return PE_CERTIFICATEREQUIRED; return PE_CERTIFICATEREQUIRED;
} }

View File

@ -208,9 +208,8 @@ sub getNotifBack {
# Current pending notification has not been found in # Current pending notification has not been found in
# request # request
$result = $fileResult = 0; $result = $fileResult = 0;
$self->logger->debulogger->debug( $self->logger->debug(
'Current pending notification has not been found', 'Current pending notification has not been found');
'debug' );
next; next;
} }

View File

@ -371,6 +371,7 @@ sub getPersistentSession {
if ( $ps->error ) { if ( $ps->error ) {
$self->logger->debug( $ps->error ); $self->logger->debug( $ps->error );
} }
else {
# Set _session_uid if not already present # Set _session_uid if not already present
unless ( defined $ps->data->{_session_uid} ) { unless ( defined $ps->data->{_session_uid} ) {
@ -381,6 +382,7 @@ sub getPersistentSession {
unless ( defined $ps->data->{_utime} ) { unless ( defined $ps->data->{_utime} ) {
$ps->update( { _utime => time } ); $ps->update( { _utime => time } );
} }
}
return $ps; return $ps;
} }