[Zope-CVS] CVS: Products/PluggableAuthService/plugins - DelegatingMultiPlugin.py:1.4 DomainAuthHelper.py:1.4 ZODBUserManager.py:1.4

[Lennart Regebro]

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

Modified Files:
	DelegatingMultiPlugin.py DomainAuthHelper.py 
	ZODBUserManager.py 
Log Message:
Adding the error logs exposed another bug: All authenticateCredentials() returned a single None when they could not authenticate, although all calls expected a tuple.


=== Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py 1.3 => 1.4 ===
--- Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py:1.3	Thu Aug 12 11:15:54 2004
+++ Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py	Mon Aug 30 09:22:41 2004
@@ -109,18 +109,18 @@
         password = credentials.get('password', '')
 
         if not acl or not login or not password:
-            return None
+            return (None, None)
 
         if login == emergency_user.getUserName():
             return ( login, login )
 
         user = acl.getUser(login)
         if user is None:
-            return None
+            return (None, None)
         elif user and user._getPassword() == password:
             return ( user.getId(), login )
             
-        return None
+        return (None, None)
 
 
     security.declarePrivate('updateCredentials')


=== Products/PluggableAuthService/plugins/DomainAuthHelper.py 1.3 => 1.4 ===
--- Products/PluggableAuthService/plugins/DomainAuthHelper.py:1.3	Thu Aug 12 11:15:54 2004
+++ Products/PluggableAuthService/plugins/DomainAuthHelper.py	Mon Aug 30 09:22:41 2004
@@ -103,7 +103,7 @@
                        , u_name
                        )
 
-        return None
+        return (None, None)
 
 
     security.declarePrivate( 'getRolesForPrincipal' )


=== Products/PluggableAuthService/plugins/ZODBUserManager.py 1.3 => 1.4 ===
--- Products/PluggableAuthService/plugins/ZODBUserManager.py:1.3	Thu Aug 12 11:15:54 2004
+++ Products/PluggableAuthService/plugins/ZODBUserManager.py	Mon Aug 30 09:22:41 2004
@@ -88,7 +88,7 @@
         password = credentials.get( 'password' )
 
         if login is None or password is None:
-            return None
+            return (None, None)
 
         userid = self._login_to_userid.get( login, login )
         digested = sha.sha( password ).hexdigest()
@@ -96,7 +96,7 @@
         if self._user_passwords.get( userid ) == digested:
             return userid, login
 
-        return None
+        return (None, None)
 
     #
     #   IUserEnumerationPlugin implementation