From 27df15774d1bf18b1d199ed91b95346694bab2b4 Mon Sep 17 00:00:00 2001 From: Yadd Date: Wed, 2 Feb 2022 12:21:09 +0100 Subject: [PATCH] Fix stop() call (#2660) --- .../lib/Lemonldap/NG/Portal/Auth/Combination.pm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Combination.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Combination.pm index f66f60010..d3c41406a 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Combination.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Combination.pm @@ -292,12 +292,16 @@ sub stop { #or $res == PE_FIRSTACCESS #or $res == PE_FORMEMPTY ); - my $ret; - eval { $ret = $mod->( 'stop', $res ) }; - if ($@) { + my ( $ret, $name ); + ( $ret, $name ) = $mod->( 'can', 'stop' ); + if ($ret) { + eval { ( $ret, $name ) = $mod->( 'stop', $res ) }; + if ($@) { - #$self->logger->error( 'Optional stop() method failed: ' . $@ ); - return 0; + $self->logger->error( + "Optional ${name}::stop() method failed: " . $@ ); + return 0; + } } return $ret; }