Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.745.2.26
diff -u -p -r1.745.2.26 user.module
--- modules/user/user.module	7 Jan 2008 02:30:35 -0000	1.745.2.26
+++ modules/user/user.module	13 Jan 2008 17:13:02 -0000
@@ -1007,8 +1007,8 @@ function user_authenticate($name, $pass)
         if ($server) {
           $name .= '@'. $server;
         }
-        $user = user_load(array('name' => $name));
-        if (!$user->uid) { // Register this new user.
+        $registered_user = user_load(array('name' => $name));
+        if (!$registered_user->uid) { // Register this new user.
           $userinfo = array('name' => $name, 'pass' => user_password(), 'init' => $name, 'status' => 1);
           if ($server) {
             $userinfo["authname_$module"] = $name;