Attachment 161926 Details for Bug 36034 – Bug 36034: fix capture of return values from checkpw

[patch] Bug 36034: fix capture of return values from checkpw

Bug-36034-fix-capture-of-return-values-from-checkp.patch (text/plain), 2.12 KB, created by Kyle M Hall (khall) on 2024-02-08 14:54:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2024-02-08 14:54:58 UTC

Size: 2.12 KB

patch

obsolete

>From 4e7ae2ee5d746a7d68044de232570396765c81e6 Mon Sep 17 00:00:00 2001
>From: Andreas Jonsson <andreas.jonsson@kreablo.se>
>Date: Thu, 8 Feb 2024 11:57:03 +0100
>Subject: [PATCH] Bug 36034: 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>
>---
> C4/Auth.pm | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 74b73563a4a..ca4ee0c8af4 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.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 36034: 161888 | 161926 | 162130 | 162131 | 162132 | 162529