projects
/
koha.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
047c5f0
)
Bug 20879: Fix regression in shibboleth when ldap enabled
author
Martin Renvoize
<martin.renvoize@ptfs-europe.com>
Thu, 21 Jun 2018 07:28:08 +0000
(08:28 +0100)
committer
Nick Clemens
<nick@bywatersolutions.com>
Fri, 22 Jun 2018 20:13:13 +0000
(20:13 +0000)
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
C4/Auth.pm
patch
|
blob
|
history
diff --git
a/C4/Auth.pm
b/C4/Auth.pm
index
5722e4f
..
2731ff2
100644
(file)
--- 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 ) {