Bugzilla – Attachment 1956 Details for
Bug 4256
C4/Auth_with_ldap.pm replication broken and corrupts data when used without update
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix for combination of auth_by_bind and replicate LDAP options
Koha-Auth_with_ldap-fix.diff (text/plain), 1.33 KB, created by
Chris Cormack
on 2010-02-23 20:13:00 UTC
(
hide
)
Description:
fix for combination of auth_by_bind and replicate LDAP options
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2010-02-23 20:13:00 UTC
Size:
1.33 KB
patch
obsolete
>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;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 4256
: 1956 |
1957
|
1958