[PATCH 2/2] Back out part of bug 5995 - do not change userid to cardnumber

[Chad Billman]

---
 C4/Auth.pm |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 2569ff1..a483630 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -737,8 +737,7 @@ sub checkauth {
 		    $info{'invalidCasLogin'} = 1 unless ($return);
         	} else {
 		    my $retuserid;
-		    ( $return, $retuserid ) = checkpw( $dbh, $userid, $password, $query );
-		    $userid = $retuserid if ($retuserid ne '');
+		    ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
 		}
 		if ($return) {
                _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime));
-- 
1.7.4.1


--------------090602050905080002080504--