View | Details | Raw Unified | Return to bug 8148
Collapse All | Expand All

(-)a/C4/Auth.pm (-1 / +1 lines)
Lines 1544-1550 sub checkpw { Link Here
1544
    if ($ldap) {
1544
    if ($ldap) {
1545
        $debug and print STDERR "## checkpw - checking LDAP\n";
1545
        $debug and print STDERR "## checkpw - checking LDAP\n";
1546
        my ($retval,$retcard,$retuserid) = checkpw_ldap(@_);    # EXTERNAL AUTH
1546
        my ($retval,$retcard,$retuserid) = checkpw_ldap(@_);    # EXTERNAL AUTH
1547
        return 0 if $retval == -1;
1547
        return 0 if $retval == -1; # Incorrect password for LDAP login attempt
1548
        ($retval) and return ($retval,$retcard,$retuserid);
1548
        ($retval) and return ($retval,$retcard,$retuserid);
1549
    }
1549
    }
1550
1550
(-)a/C4/Auth_with_ldap.pm (-2 / +1 lines)
Lines 146-152 sub checkpw_ldap { Link Here
146
        my $res = $db->bind( $principal_name, password => $password );
146
        my $res = $db->bind( $principal_name, password => $password );
147
        if ( $res->code ) {
147
        if ( $res->code ) {
148
            warn "LDAP bind failed as kohauser $userid: " . description($res);
148
            warn "LDAP bind failed as kohauser $userid: " . description($res);
149
            return 0;
149
            return -1;
150
        }
150
        }
151
        if ( !defined($userldapentry)
151
        if ( !defined($userldapentry)
152
            && ( $config{update} or $config{replicate} ) )
152
            && ( $config{update} or $config{replicate} ) )
153
- 

Return to bug 8148