From 967d34815c92308fb74f6ac2965b1be807c17353 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 21 Jun 2018 08:28:08 +0100 Subject: [PATCH] Bug 20879: Fix regression in shibboleth when ldap enabled Signed-off-by: Nick Clemens Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit c528c05f303d1d4c99680ebf61fb78a79b92bedf) Signed-off-by: Fridolin Somers (cherry picked from commit 9f59f945073334daff0339c0e24a7e8641de9e6b) Signed-off-by: Fridolin Somers --- C4/Auth.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 38f7c95ec9..be3bb4b093 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -1771,7 +1771,7 @@ sub checkpw { if ( $patron and $patron->account_locked ) { # Nothing to check, account is locked - } elsif ($ldap) { + } elsif ($ldap && defined($password)) { $debug and print STDERR "## checkpw - checking LDAP\n"; my ( $retval, $retcard, $retuserid ) = checkpw_ldap(@_); # EXTERNAL AUTH if ( $retval == 1 ) { -- 2.39.5