[CalendarServer-changes] [2166] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 2166
          http://trac.macosforge.org/projects/calendarserver/changeset/2166
Author:   wsanchez at apple.com
Date:     2008-02-20 16:34:04 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
Don't require a ServicesLocator for user account provisioning, but (as with groups) disable calendaring.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2008-02-21 00:04:04 UTC (rev 2165)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2008-02-21 00:34:04 UTC (rev 2166)
@@ -455,16 +455,19 @@
 
             if self.requireComputerRecord:
                 if not value.get(dsattributes.kDSNAttrServicesLocator):
-                    if recordType == DirectoryService.recordType_groups:
+                    if (
+                        recordType == DirectoryService.recordType_users or
+                        recordType == DirectoryService.recordType_groups
+                    ):
                         enabledForCalendaring = False
                         logging.debug(
-                            "Group %s is not enabled for calendaring but may be used in ACLs"
-                            % (recordShortName,), system="OpenDirectoryService"
+                            "Record (%s) %s is not enabled for calendaring but may be used in ACLs"
+                            % (recordType, recordShortName), system="OpenDirectoryService"
                         )
                     else:
                         logging.err(
-                            "Directory (incorrectly) returned a record with no ServicesLocator attribute: %s"
-                            % (recordShortName,), system="OpenDirectoryService"
+                            "Directory (incorrectly) returned a record with no ServicesLocator attribute: (%s) %s"
+                            % (recordType, recordShortName), system="OpenDirectoryService"
                         )
                         continue
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080220/cc4e8a41/attachment-0001.html