[CalendarServer-changes] [8874] CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py

[source_changes at macosforge.org]

Revision: 8874
          http://trac.macosforge.org/projects/calendarserver/changeset/8874
Author:   sagen at apple.com
Date:     2012-03-14 17:44:07 -0700 (Wed, 14 Mar 2012)
Log Message:
-----------
Ignore records that are not faulted in (likely due to missing guid attribute in LDAP)

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

Modified: CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py	2012-03-15 00:07:34 UTC (rev 8873)
+++ CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py	2012-03-15 00:44:07 UTC (rev 8874)
@@ -1338,8 +1338,9 @@
                 dn = normalizeDNstr(dn)
                 shortName = self.service._getUniqueLdapAttribute(attrs, "cn")
                 self.log_debug("%s is a member of %s" % (self._memberId, shortName))
-                groups.append(self.service.recordWithShortName(recordType,
-                    shortName))
+                record = self.service.recordWithShortName(recordType, shortName)
+                if record is not None:
+                    groups.append(record)
         except ldap.PROTOCOL_ERROR, e:
             self.log_warn(str(e))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120314/5b19bb76/attachment-0001.html>