Revision: 1454 http://trac.macosforge.org/projects/calendarserver/changeset/1454 Author: cdaboo@apple.com Date: 2007-04-05 14:13:24 -0700 (Thu, 05 Apr 2007) Log Message: ----------- Add CALDAV:read-free-busy inheritable for DAV:authenticated on each calendar home by default. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2007-04-05 20:54:34 UTC (rev 1453) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2007-04-05 21:13:24 UTC (rev 1454) @@ -217,17 +217,6 @@ assert isinstance(child, CalDAVResource), "Child %r is not a %s: %r" % (childName, CalDAVResource.__name__, child) def setupChild(_): - # Grant read-free-busy access to authenticated users - child.setAccessControlList( - davxml.ACL( - davxml.ACE( - davxml.Principal(davxml.Authenticated()), - davxml.Grant(davxml.Privilege(caldavxml.ReadFreeBusy())), - TwistedACLInheritable(), - ), - ) - ) - # Set calendar-free-busy-set on inbox inbox = self.getChild("inbox") # FIXME: Shouldn't have to call provision() on another resource @@ -278,6 +267,12 @@ davxml.Protected(), TwistedACLInheritable(), ), + # Inheritable CALDAV:read-free-busy access for authenticated users. + davxml.ACE( + davxml.Principal(davxml.Authenticated()), + davxml.Grant(davxml.Privilege(caldavxml.ReadFreeBusy())), + TwistedACLInheritable(), + ), ) if config.EnableProxyPrincipals: