diff --git a/koha/srv/koha/C4/Auth_with_ldap.pm b/koha/srv/koha/C4/Auth_with_ldap.pm index eb8b042..c375300 100644 --- a/koha/srv/koha/C4/Auth_with_ldap.pm +++ b/koha/srv/koha/C4/Auth_with_ldap.pm @@ -58,7 +58,7 @@ my $prefhost = $ldap->{hostname} or die ldapserver_error('hostname'); my $base = $ldap->{base} or die ldapserver_error('base'); $ldapname = $ldap->{user} ; $ldappassword = $ldap->{pass} ; -our %mapping = %{$ldap->{mapping}} || (); # or die ldapserver_error('mapping'); +our %mapping = %{$ldap->{mapping}}; # FIXME dpavlin -- don't die because of || (); from 6eaf8511c70eb82d797c941ef528f4310a15e9f9 my @mapkeys = keys %mapping; $debug and print STDERR "Got ", scalar(@mapkeys), " ldap mapkeys ( total ): ", join ' ', @mapkeys, "\n"; @mapkeys = grep {defined $mapping{$_}->{is}} @mapkeys; @@ -122,6 +122,11 @@ sub checkpw_ldap { $debug and warn "LDAP bind failed as kohauser $principal_name: ". description($res); return 0; } + + # 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; + } else { my $search = search_method($db, $userid) or return 0; # warnings are in the sub $userldapentry = $search->shift_entry;