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

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

Return to bug 8148