Attachment 30037 Details for Bug 8148 – [PASSED QA] Bug 8148 - LDAP auth_by_bind doesn't fallback to local auth

[patch] [PASSED QA] Bug 8148 - LDAP auth_by_bind doesn't fallback to local auth

PASSED-QA-Bug-8148---LDAP-authbybind-doesnt-fallba.patch (text/plain), 1.60 KB, created by Martin Renvoize (ashimema) on 2014-07-24 15:20:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2014-07-24 15:20:49 UTC

Size: 1.60 KB

patch

obsolete

>From 934be3ba1d3b8870238571bdf879f14973395180 Mon Sep 17 00:00:00 2001
>From: Dobrica Pavlinusic <dpavlin@rot13.org>
>Date: Wed, 12 Mar 2014 10:45:09 +0100
>Subject: [PATCH] [PASSED QA] Bug 8148 - LDAP auth_by_bind doesn't fallback to
> local auth
>
>This patch covers LDAP auth_by_bind configuration so that wrong
>LDAP password will return -1 to C4::Auth so we can abort local auth
>and prevent users logging in with stale database passwords.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Auth.pm           |    2 +-
> C4/Auth_with_ldap.pm |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 523f3fb..9ba4305 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -1544,7 +1544,7 @@ sub checkpw {
>     if ($ldap) {
>         $debug and print STDERR "## checkpw - checking LDAP\n";
>         my ($retval,$retcard,$retuserid) = checkpw_ldap(@_);    # EXTERNAL AUTH
>-        return 0 if $retval == -1;
>+        return 0 if $retval == -1; # Incorrect password for LDAP login attempt
>         ($retval) and return ($retval,$retcard,$retuserid);
>     }
> 
>diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
>index cf120e6..b42506d 100644
>--- a/C4/Auth_with_ldap.pm
>+++ b/C4/Auth_with_ldap.pm
>@@ -146,7 +146,7 @@ sub checkpw_ldap {
>         my $res = $db->bind( $principal_name, password => $password );
>         if ( $res->code ) {
>             warn "LDAP bind failed as kohauser $userid: " . description($res);
>-            return 0;
>+            return -1;
>         }
>         if ( !defined($userldapentry)
>             && ( $config{update} or $config{replicate} ) )
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 8148: 25522 | 25523 | 26024 | 26025 | 26147 | 26543 | 29977 | 29978 | 29979 | 30035 | 30036 | 30037 | 30473 | 30524 | 30525 | 30586 | 30587