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

[Chris McDonough]

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

Modified Files:
	ZODBUserManager.py 
Log Message:
Don't complain in the case that we don't have the user record for a user id (this is common in the case that a user from a user folder "lower" in the tree is browsing a part of the tree in which a PAS is contained).


=== Products/PluggableAuthService/plugins/ZODBUserManager.py 1.7 => 1.8 ===
--- Products/PluggableAuthService/plugins/ZODBUserManager.py:1.7	Thu Oct 28 10:08:16 2004
+++ Products/PluggableAuthService/plugins/ZODBUserManager.py	Mon Nov  8 04:02:21 2004
@@ -92,10 +92,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