From 897b4a2c1599d243c3b21b72cdddde39fb3c77e1 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Tue, 30 Apr 2024 14:39:36 +0000
Subject: [PATCH] Bug 36575: (QA follow-up) Shibboleth POD and checkpw_internal
 call

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 C4/Auth.pm                 | 4 ++--
 C4/Auth_with_shibboleth.pm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 7aa7d6227d..7446af0aa1 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -2039,8 +2039,8 @@ sub checkpw {
 
         # INTERNAL AUTH
         @return    = checkpw_internal( $userid, $password, $no_set_userenv );
-        $passwd_ok = 1 if $return[0] > 0;                                       # 1 or 2
-        $patron    = $return[3];
+        $passwd_ok = $return[0];
+        $patron    = $passwd_ok ? $return[3] : undef;
     }
 
     if ( defined $userid && !$patron ) {
diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
index f9ba592b3e..3e6f42b57c 100644
--- a/C4/Auth_with_shibboleth.pm
+++ b/C4/Auth_with_shibboleth.pm
@@ -409,7 +409,7 @@ This routine is NOT exported
 
 =head2 _autocreate
 
-  my ( $retval, $retcard, $retuserid ) = _autocreate( $config, $match );
+  my ( $retval, $retcard, $retuserid, $patron ) = _autocreate( $config, $match, $patron );
 
 Given a shibboleth attribute reference and a userid this internal routine will add the given user to Koha and return their user credentials.