[Zope-CVS] CVS: Products/PluggableAuthService/plugins - ZODBUserManager.py:1.6.4.5

[Jens Vagelpohl]

Update of /cvs-repository/Products/PluggableAuthService/plugins
In directory cvs.zope.org:/tmp/cvs-serv15362/plugins

Modified Files:
      Tag: jens-implement_caching_branch
	ZODBUserManager.py 
Log Message:
- merge Chris' changes from HEAD


=== Products/PluggableAuthService/plugins/ZODBUserManager.py 1.6.4.4 => 1.6.4.5 ===
--- Products/PluggableAuthService/plugins/ZODBUserManager.py:1.6.4.4	Mon Nov  8 02:13:38 2004
+++ Products/PluggableAuthService/plugins/ZODBUserManager.py	Mon Nov  8 04:36:52 2004
@@ -96,10 +96,11 @@
 
         userid = self._login_to_userid.get( login, login )
 
-        if userid is None:
-            return None
+        reference = self._user_passwords.get(userid)
 
-        reference = self._user_passwords[ userid ]
+        if reference is None:
+            return None
+        
         if AuthEncoding.is_encrypted( reference ):
             if AuthEncoding.pw_validate( reference, password ):
                 return userid, login