[Koha-bugs] [Bug 8993] LDAP authentication improvements: multiple branch and transformation modules

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8993

--- Comment #46 from Martin Renvoize <martin.renvoize at ptfs-europe.com> ---
Great fast response Julian.. unfortunately I still can't get it to apply :(

Falling back to patching base and 3-way merge...
Auto-merging C4/Auth_with_ldap.pm
CONFLICT (content): Merge conflict in C4/Auth_with_ldap.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 8993: LDAP authentication improvements

Looking at the merge markers, it looks like the main routine 'checkpw_ldap' is
the issue, but it's such an extensive re-write that I don't want to screw it up
by trying to merge it myself.

-- 
You are receiving this mail because:
You are watching all bug changes.