From f195037f8f0d08f346e37ff2cd6dbee03e3867d9 Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Thu, 8 Feb 2024 11:57:03 +0100 Subject: [PATCH] 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 Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize (cherry picked from commit 5f9e9e5df2377dd3b9e47354e9eee147bc048792) Signed-off-by: Fridolin Somers --- C4/Auth.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 74b73563a4..ca4ee0c8af 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -1030,7 +1030,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); @@ -1098,8 +1099,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); @@ -1597,7 +1599,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 ) ) { -- 2.39.5