Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'kc/new/bug_5094' into kcmaster

Browse source
This commit is contained in:
Chris Cormack 2011-06-17 15:07:18 +12:00
commit c6ac616793
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
C4/Auth_with_ldap.pm
View file

@ -119,8 +119,14 @@ sub checkpw_ldap {
}
# FIXME dpavlin -- we really need $userldapentry leater on even if using auth_by_bind!
my $search = search_method($db, $userid) or return 0; # warnings are in the sub
$userldapentry = $search->shift_entry;
# BUG #5094
# 2010-08-04 JeremyC
# a $userldapentry is only needed if either updating or replicating are enabled
if($config{update} or $config{replicate}) {
my $search = search_method($db, $userid) or return 0; # warnings are in the sub
$userldapentry = $search->shift_entry;
}
} else {
my $res = ($config{anonymous}) ? $db->bind : $db->bind($ldapname, password=>$ldappassword);