[CalendarServer-changes] [4029] CalendarServer/trunk/twistedcaldav/directory/ cachingappleopendirectory.py

[source_changes at macosforge.org]

Revision: 4029
          http://trac.macosforge.org/projects/calendarserver/changeset/4029
Author:   sagen at apple.com
Date:     2009-04-16 15:03:03 -0700 (Thu, 16 Apr 2009)
Log Message:
-----------
Force the imip delivery user to be calendar-enabled so that injection is allowed.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/cachingappleopendirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/cachingappleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/cachingappleopendirectory.py	2009-04-16 18:07:32 UTC (rev 4028)
+++ CalendarServer/trunk/twistedcaldav/directory/cachingappleopendirectory.py	2009-04-16 22:03:03 UTC (rev 4029)
@@ -38,6 +38,7 @@
 from twisted.internet.threads import deferToThread
 from twisted.cred.credentials import UsernamePassword
 from twisted.web2.auth.digest import DigestedCredentials
+from twistedcaldav.config import config
 
 from twistedcaldav.directory.cachingdirectory import CachingDirectoryService,\
     CachingDirectoryRecord
@@ -578,7 +579,10 @@
             if recordType == self.recordType_groups:
                 enabledForCalendaring = False
             else:
-                if self.restrictEnabledRecords:
+                if (
+                    self.restrictEnabledRecords and
+                    config.Scheduling.iMIP.Username != recordShortName
+                ):
                     if time.time() - self.restrictedTimestamp > self.cacheTimeout:
                         attributeToMatch = dsattributes.kDS1AttrGeneratedUID if self.restrictToGUID else dsattributes.kDSNAttrRecordName
                         valueToMatch = self.restrictToGroup
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090416/885740cb/attachment.html>