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

source_changes at macosforge.org source_changes at macosforge.org
Fri Jun 20 07:49:05 PDT 2008


Revision: 2611
          http://trac.macosforge.org/projects/calendarserver/changeset/2611
Author:   cdaboo at apple.com
Date:     2008-06-20 07:49:05 -0700 (Fri, 20 Jun 2008)
Log Message:
-----------
Add some missing debug log info.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2008-06-20 00:24:18 UTC (rev 2610)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2008-06-20 14:49:05 UTC (rev 2611)
@@ -121,6 +121,15 @@
             if groupGUID in processedGUIDs:
                 continue
 
+            self.log_debug("opendirectory.queryRecordsWithAttribute_list(%r,%r,%r,%r,%r,%r,%r)" % (
+                self.directory,
+                dsattributes.kDS1AttrGeneratedUID,
+                groupGUID,
+                dsattributes.eDSExact,
+                False,
+                dsattributes.kDSStdRecordTypeGroups,
+                [dsattributes.kDSNAttrGroupMembers, dsattributes.kDSNAttrNestedGroups]
+            ))
             result = opendirectory.queryRecordsWithAttribute_list(
                 self.directory,
                 dsattributes.kDS1AttrGeneratedUID,
@@ -185,6 +194,17 @@
             "dsAttrTypeNative:apple-serviceinfo",
         ]
 
+        self.log_debug("opendirectory.queryRecordsWithAttribute_list(%r,%r,%r,%r,%r)" % (
+            self.directory,
+            dsquery.match(
+                "dsAttrTypeNative:apple-serviceinfo",
+                vhostname,
+                dsattributes.eDSContains,
+            ).generate(),
+            True,    # case insentive for hostnames
+            dsattributes.kDSStdRecordTypeComputers,
+            attrs
+        ))
         records = opendirectory.queryRecordsWithAttributes_list(
             self.directory,
             dsquery.match(
@@ -673,6 +693,15 @@
         if self.requireComputerRecord:
             if self.isWorkgroupServer and recordType == DirectoryService.recordType_users:
                 if shortName is None and guid is None:
+                    self.log_debug("opendirectory.queryRecordsWithAttribute_list(%r,%r,%r,%r,%r,%r,%r)" % (
+                        self.directory,
+                        dsattributes.kDSNAttrRecordName,
+                        saclGroup,
+                        dsattributes.eDSExact,
+                        False,
+                        dsattributes.kDSStdRecordTypeGroups,
+                        [dsattributes.kDSNAttrGroupMembers, dsattributes.kDSNAttrNestedGroups],
+                    ))
                     results = opendirectory.queryRecordsWithAttribute_list(
                         self.directory,
                         dsattributes.kDSNAttrRecordName,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080620/38ec93d6/attachment-0001.htm 


More information about the calendarserver-changes mailing list