[Zope-Checkins] CVS: Zope/lib/python/AccessControl - ZopeSecurityPolicy.py:1.12.22.1 cAccessControl.c:1.10.4.1 pZopeSecurityPolicy.py:1.1.22.1

Shane Hathaway shane@digicool.com
Tue, 9 Oct 2001 10:55:56 -0400


Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv29218

Modified Files:
      Tag: shane-fix-cAccessControl-branch
	ZopeSecurityPolicy.py cAccessControl.c pZopeSecurityPolicy.py 
Log Message:
Corrected check for aq_* names


=== Zope/lib/python/AccessControl/ZopeSecurityPolicy.py 1.12 => 1.12.22.1 ===
 from SimpleObjectPolicies import _noroles
 
-import cAccessControl
-
-ZopeSecurityPolicy = cAccessControl.ZopeSecurityPolicy
+if 1:
+    from cAccessControl import ZopeSecurityPolicy
+else:
+    from pZopeSecurityPolicy import ZopeSecurityPolicy
 
 


=== Zope/lib/python/AccessControl/cAccessControl.c 1.10 => 1.10.4.1 ===
 	if (PyString_Check(name)) {		/* XXX what about unicode? */
 		sname = PyString_AsString(name);
-		if (strncmp(sname,"aq_", 4) == 0) {
-			if (!strncmp(sname,"aq_parent", 10) &&
-				!strncmp(sname,"aq_explicit", 12)) {
+		if (strncmp(sname,"aq_", 3) == 0) {
+			if (strncmp(sname,"aq_parent", 10) != 0 &&
+				strncmp(sname,"aq_explicit", 12) != 0) {
 				/* Access control violation, return 0 */
 
 				rval = PyInt_FromLong(0);


=== Zope/lib/python/AccessControl/pZopeSecurityPolicy.py 1.1 => 1.1.22.1 ===
 from Acquisition import aq_base
 
-from PermissionRole import _what_not_even_god_should_do, rolesForPermissionOn
+from pPermissionRole import _what_not_even_god_should_do, rolesForPermissionOn
 
 
 class ZopeSecurityPolicy: