[CalendarServer-changes] [1275] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1275
          http://trac.macosforge.org/projects/calendarserver/changeset/1275
Author:   dreid at apple.com
Date:     2007-02-27 11:18:40 -0800 (Tue, 27 Feb 2007)

Log Message:
-----------
Warn if CheckSACL method is unset but sacls are on in the config, also turn off sacls in the default test config and the buildbot config.

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test-logged.plist
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/twistedcaldav/root.py

Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-27 17:33:12 UTC (rev 1274)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-27 19:18:40 UTC (rev 1275)
@@ -312,7 +312,7 @@
   -->
 
   <key>EnableSACLs</key>
-  <true/>
+  <false/>
 
 
   <!--

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2007-02-27 17:33:12 UTC (rev 1274)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2007-02-27 19:18:40 UTC (rev 1275)
@@ -312,7 +312,7 @@
   -->
 
   <key>EnableSACLs</key>
-  <true/>
+  <false/>
 
 
   <!--

Modified: CalendarServer/trunk/twistedcaldav/root.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/root.py	2007-02-27 17:33:12 UTC (rev 1274)
+++ CalendarServer/trunk/twistedcaldav/root.py	2007-02-27 19:18:40 UTC (rev 1275)
@@ -16,6 +16,8 @@
 # DRI: David Reid, dreid at apple.com
 ##
 
+from twisted.python import log
+
 from twisted.internet import defer
 from twisted.python.failure import Failure
 from twisted.cred.error import UnauthorizedLogin
@@ -38,10 +40,15 @@
 
     def __init__(self, path, *args, **kwargs):
         super(RootResource, self).__init__(path, *args, **kwargs)
-        
-        if config.EnableSACLs and RootResource.CheckSACL:
-            self.useSacls = True
 
+        if config.EnableSACLs:
+            if RootResource.CheckSACL:
+                self.useSacls = True
+            else:
+                log.msg(("RootResource.CheckSACL is unset but "
+                         "config.EnableSACLs is True, SACLs will not be"
+                         "turned on."))
+
     def checkSacl(self, request):
         """
         Check SACLs against the current request

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070227/8398d921/attachment.html