[Koha-bugs] [Bug 6296] Allow authentication to Koha via PKI / x.509 certificates

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

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

M. de Rooy <m.de.rooy at rijksmuseum.nl> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Signed Off                  |Failed QA
          QAContact|koha-bugs at lists.koha-commun |ian.walls at bywatersolutions.
                   |ity.org                     |com

--- Comment #12 from M. de Rooy <m.de.rooy at rijksmuseum.nl> 2011-11-14 12:59:13 UTC ---
Please resolve whitespace issues and rebase (syspref and updatedatabase).

Applying: Bug 6296: allow users to be authenticated by SSL client certs
/usr/share/koha/testclone/.git/rebase-apply/patch:29: space before tab in
indent.
                my $borrower = GetMember(borrowernumber => $user);
/usr/share/koha/testclone/.git/rebase-apply/patch:30: space before tab in
indent.
                if ($borrower) {
/usr/share/koha/testclone/.git/rebase-apply/patch:31: space before tab in
indent.
                $borrowernumber = $user;
/usr/share/koha/testclone/.git/rebase-apply/patch:136: trailing whitespace.
                    SELECT borrowernumber, firstname, surname, flags,
borrowers.branchcode,
/usr/share/koha/testclone/.git/rebase-apply/patch:137: trailing whitespace.
                    branches.branchname    as branchname,
warning: C4/Auth.pm has type 100755, expected 100644
error: patch failed: installer/data/mysql/sysprefs.sql:327
error: installer/data/mysql/sysprefs.sql: patch does not apply
error: patch failed: installer/data/mysql/updatedatabase.pl:4523
error: installer/data/mysql/updatedatabase.pl: patch does not apply
Using index info to reconstruct a base tree...
<stdin>:29: space before tab in indent.
                my $borrower = GetMember(borrowernumber => $user);
<stdin>:30: space before tab in indent.
                if ($borrower) {
<stdin>:31: space before tab in indent.
                $borrowernumber = $user;
<stdin>:136: trailing whitespace.
                    SELECT borrowernumber, firstname, surname, flags,
borrowers.branchcode,
<stdin>:137: trailing whitespace.
                    branches.branchname    as branchname,
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merged C4/Auth.pm
Auto-merged C4/Members.pm
Auto-merged installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merged installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.