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

[source_changes at macosforge.org]

Revision: 1016
          http://trac.macosforge.org/projects/calendarserver/changeset/1016
Author:   cdaboo at apple.com
Date:     2007-01-10 18:33:40 -0800 (Wed, 10 Jan 2007)

Log Message:
-----------
Make sure we get the CalendarPrincipalURI from the directory server and use that as the calendar user
address (for now).

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-01-11 01:20:56 UTC (rev 1015)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-01-11 02:33:40 UTC (rev 1016)
@@ -91,6 +91,7 @@
             attrs = [
                 dsattributes.kDS1AttrGeneratedUID,
                 dsattributes.kDS1AttrDistinguishedName,
+                dsattributes.kDSNAttrCalendarPrincipalURI,
             ]
             if recordType == DirectoryService.recordType_users:
                 listRecordType = dsattributes.kDSStdRecordTypeUsers
@@ -119,6 +120,14 @@
                     continue
                 realName = value.get(dsattributes.kDS1AttrDistinguishedName)
 
+                cuaddrs = value.get(dsattributes.kDSNAttrCalendarPrincipalURI)
+                cuaddrset = set()
+                if cuaddrs is not None:
+                    if isinstance(cuaddrs, str):
+                        cuaddrset.update((cuaddrs,))
+                    else:
+                        cuaddrset.update(cuaddrs)
+
                 if recordType == DirectoryService.recordType_groups:
                     memberGUIDs = value.get(dsattributes.kDSNAttrGroupMembers)
                     if memberGUIDs is None:
@@ -134,7 +143,7 @@
                     guid                  = guid,
                     shortName             = shortName,
                     fullName              = realName,
-                    calendarUserAddresses = set(), # FIXME: Should be able to look up email, etc.
+                    calendarUserAddresses = cuaddrset,
                     memberGUIDs           = memberGUIDs,
                 )
 

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