From 799b09cfa632a277ed288e3ea9bd110cccfc8be2 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 24 Apr 2024 14:23:51 +0000 Subject: [PATCH] Bug 36575: (bug 34893 follow-up) Return patron from LDAP Signed-off-by: Marcel de Rooy (cherry picked from commit e6ce7aded6bc737fd98c2e94aba51abb4581afbb) Signed-off-by: Fridolin Somers --- C4/Auth_with_ldap.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm index 9b8b5d2e57..f0993c89ba 100644 --- a/C4/Auth_with_ldap.pm +++ b/C4/Auth_with_ldap.pm @@ -212,12 +212,13 @@ sub checkpw_ldap { } if ($borrowernumber) { - if ($config{update}) { # A1, B1 - my $c2 = &update_local($local_userid,$password,$borrowernumber,\%borrower) || ''; - ($cardnumber eq $c2) or warn "update_local returned cardnumber '$c2' instead of '$cardnumber'"; - } else { # C1, D1 - # maybe update just the password? - return(1, $cardnumber, $local_userid); + if ( $config{update} ) { # A1, B1 + my $c2 = &update_local( $local_userid, $password, $borrowernumber, \%borrower ) || ''; + ( $cardnumber eq $c2 ) or warn "update_local returned cardnumber '$c2' instead of '$cardnumber'"; + } else { # C1, D1 + # maybe update just the password? + my $patron = Koha::Patrons->find($borrowernumber); + return ( 1, $cardnumber, $local_userid, $patron ); } } elsif ($config{replicate}) { # A2, C2 my @columns = Koha::Patrons->columns; -- 2.39.5