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

(-)a/C4/Auth.pm (-4 / +6 lines)
Lines 1031-1037 sub checkauth { Link Here
1031
            unless ($shibSuccess) {
1031
            unless ($shibSuccess) {
1032
                if ( $cas && $query->param('ticket') ) {
1032
                if ( $cas && $query->param('ticket') ) {
1033
                    my $retuserid;
1033
                    my $retuserid;
1034
                    ( $return, $cardnumber, $retuserid, $cas_ticket ) =
1034
                    my $patron;
1035
                    ( $return, $cardnumber, $retuserid, $patron, $cas_ticket ) =
1035
                      checkpw( $userid, $password, $query, $type );
1036
                      checkpw( $userid, $password, $query, $type );
1036
                    $userid = $retuserid;
1037
                    $userid = $retuserid;
1037
                    $info{'invalidCasLogin'} = 1 unless ($return);
1038
                    $info{'invalidCasLogin'} = 1 unless ($return);
Lines 1099-1106 sub checkauth { Link Here
1099
                            && $q_userid eq C4::Context->preference('AutoSelfCheckID') )
1100
                            && $q_userid eq C4::Context->preference('AutoSelfCheckID') )
1100
                      )
1101
                      )
1101
                    {
1102
                    {
1103
                        my $patron;
1102
1104
1103
                        ( $return, $cardnumber, $retuserid, $cas_ticket ) =
1105
                        ( $return, $cardnumber, $retuserid, $patron, $cas_ticket ) =
1104
                          checkpw( $q_userid, $password, $query, $type );
1106
                          checkpw( $q_userid, $password, $query, $type );
1105
                        $userid = $retuserid if ($retuserid);
1107
                        $userid = $retuserid if ($retuserid);
1106
                        $info{'invalid_username_or_password'} = 1 unless ($return);
1108
                        $info{'invalid_username_or_password'} = 1 unless ($return);
Lines 1593-1599 sub check_api_auth { Link Here
1593
                return ( "failed", undef, undef );
1595
                return ( "failed", undef, undef );
1594
            }
1596
            }
1595
            my $newuserid;
1597
            my $newuserid;
1596
            ( $return, $cardnumber, $newuserid, $cas_ticket ) = checkpw( $userid, $password, $query );
1598
            my $patron;
1599
            ( $return, $cardnumber, $newuserid, $patron, $cas_ticket ) = checkpw( $userid, $password, $query );
1597
        }
1600
        }
1598
1601
1599
        if ( $return and haspermission( $userid, $flagsrequired ) ) {
1602
        if ( $return and haspermission( $userid, $flagsrequired ) ) {
1600
- 

Return to bug 36034