[Zope-CVS] CVS: Products/PluggableAuthService - PluggableAuthService.py:1.12

[Zachery Bir]

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

Modified Files:
	PluggableAuthService.py 
Log Message:
our marker object '_noroles' can't be tested for equality across the
Python-C bridge, so we have to exclude it here so that each
implementation (Python or C) can use its appropriate default.


=== Products/PluggableAuthService/PluggableAuthService.py 1.11 => 1.12 ===
--- Products/PluggableAuthService/PluggableAuthService.py:1.11	Tue Sep  7 14:21:08 2004
+++ Products/PluggableAuthService/PluggableAuthService.py	Wed Sep  8 14:02:21 2004
@@ -928,13 +928,21 @@
         security = getSecurityManager()
         try:
             try:
-                if security.validate( accessed
-                                    , container
-                                    , name
-                                    , value
-                                    , roles
-                                    ):
-                    return 1
+                if roles is _noroles:
+                    if security.validate( accessed
+                                        , container
+                                        , name
+                                        , value
+                                        ):
+                        return 1
+                else:
+                    if security.validate( accessed
+                                        , container
+                                        , name
+                                        , value
+                                        , roles
+                                        ):
+                        return 1
             except:
                 noSecurityManager()
                 raise