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

source_changes at macosforge.org source_changes at macosforge.org
Mon Aug 20 07:53:04 PDT 2007


Revision: 1798
          http://trac.macosforge.org/projects/calendarserver/changeset/1798
Author:   cdaboo at apple.com
Date:     2007-08-20 07:53:04 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
Make sure nested groups are listed as members of groups.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-08-17 22:55:39 UTC (rev 1797)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-08-20 14:53:04 UTC (rev 1798)
@@ -414,6 +414,7 @@
         elif recordType == DirectoryService.recordType_groups:
             listRecordType = dsattributes.kDSStdRecordTypeGroups
             attrs.append(dsattributes.kDSNAttrGroupMembers)
+            attrs.append(dsattributes.kDSNAttrNestedGroups)
 
         elif recordType == DirectoryService.recordType_locations:
             listRecordType = dsattributes.kDSStdRecordTypePlaces
@@ -499,6 +500,11 @@
                     memberGUIDs = ()
                 elif type(memberGUIDs) is str:
                     memberGUIDs = (memberGUIDs,)
+                nestedGUIDs = value.get(dsattributes.kDSNAttrNestedGroups)
+                if nestedGUIDs:
+                    if type(nestedGUIDs) is str:
+                        nestedGUIDs = (nestedGUIDs,)
+                    memberGUIDs += tuple(nestedGUIDs)
             else:
                 memberGUIDs = ()
 

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


More information about the calendarserver-changes mailing list