gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 36034: (bug 34893 follow-up) fix capture of return values from checkpw 

Adapt code to the change of return value type of checkpw
introduced in bug 34893

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Andreas Jonsson 2024-02-08 11:57:03 +01:00 committed by Wainui Witika-Park
parent 808c187408
commit f79702cc0e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
C4/Auth.pm
View File

@ -1055,7 +1055,8 @@ sub checkauth {
unless ($shibSuccess) {
if ( $cas && $query->param('ticket') ) {
my $retuserid;
( $return, $cardnumber, $retuserid, $cas_ticket ) =
my $patron;
( $return, $cardnumber, $retuserid, $patron, $cas_ticket ) =
checkpw( $userid, $password, $query, $type );
$userid = $retuserid;
$info{'invalidCasLogin'} = 1 unless ($return);
@ -1123,8 +1124,9 @@ sub checkauth {
&& $q_userid eq C4::Context->preference('AutoSelfCheckID') )
)
{
my $patron;
( $return, $cardnumber, $retuserid, $cas_ticket ) =
( $return, $cardnumber, $retuserid, $patron, $cas_ticket ) =
checkpw( $q_userid, $password, $query, $type );
$userid = $retuserid if ($retuserid);
$info{'invalid_username_or_password'} = 1 unless ($return);
@ -1611,7 +1613,8 @@ sub check_api_auth {
return ( "failed", undef, undef );
}
my $newuserid;
( $return, $cardnumber, $newuserid, $cas_ticket ) = checkpw( $userid, $password, $query );
my $patron;
( $return, $cardnumber, $newuserid, $patron, $cas_ticket ) = checkpw( $userid, $password, $query );
}
if ( $return and haspermission( $userid, $flagsrequired ) ) {