[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.01-60-g3153502

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 17.05.x has been updated
       via  3153502c6175e98193dd883b15d8b0770eb6abe2 (commit)
       via  a2703c15cf82aa61b9f6b55f343a45f368d68a6f (commit)
      from  50431a49849089fd1960accc26b934f29763cd99 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3153502c6175e98193dd883b15d8b0770eb6abe2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 14 08:07:31 2017 +0200

    Bug 18880: [QA Follow-up] Finishing touch
    
    Do not fill @return if retval == -1 for LDAP (see cfc484b17).
    No need to call store after an DBIx update. Rearranged the if statement.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 313e1f2f271bad995f33db6884b553efe79e9438)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit a2703c15cf82aa61b9f6b55f343a45f368d68a6f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jul 11 12:24:36 2017 -0300

    Bug 18880: Fix authentication fallback for external authentications
    
    A regression in commit cfc484b17 / bug #18314 breaks the local
    authentication fallback for all external authentications like LDAP, CAS
    and Shibboleth.
    
    The regression itself is a logical error as "@return = (0)" is
    considered to be "false" when checked with "unless" (line 1814). That's
    wrong as "unless" tests the number of elements in a list.
    
    This patch tries to simplify the logic by adding a $passwd_ok and
    $check_internal_as_fallback flags to be more verbose and hopefully more
    understandable.
    The goal here is simply to restore back the same logic as before cfc484b17
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d852b332666da212f1ab8667fa044b16eb151717)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm |   38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository