[CalendarServer-changes] [13217] CalendarServer/trunk/txdav/who/util.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Apr 8 22:17:44 PDT 2014


Revision: 13217
          http://trac.calendarserver.org//changeset/13217
Author:   gaya at apple.com
Date:     2014-04-08 22:17:43 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
remove last change due to import error

Modified Paths:
--------------
    CalendarServer/trunk/txdav/who/util.py

Modified: CalendarServer/trunk/txdav/who/util.py
===================================================================
--- CalendarServer/trunk/txdav/who/util.py	2014-04-09 05:14:38 UTC (rev 13216)
+++ CalendarServer/trunk/txdav/who/util.py	2014-04-09 05:17:43 UTC (rev 13217)
@@ -25,9 +25,7 @@
     FieldName as BaseFieldName, RecordType, DirectoryConfigurationError
 )
 from twext.who.ldap import (
-    DirectoryService as LDAPDirectoryService, LDAPAttribute,
-    FieldName as LDAPFieldName,
-    RecordTypeSchema, LDAPObjectClass
+    DirectoryService as LDAPDirectoryService, LDAPAttribute
 )
 from twext.who.util import ConstantsContainer
 from twisted.cred.credentials import UsernamePassword
@@ -113,33 +111,6 @@
                     BaseFieldName.fullNames: (LDAPAttribute.cn.value,),
                     BaseFieldName.emailAddresses: (LDAPAttribute.mail.value,),
                     BaseFieldName.password: (LDAPAttribute.userPassword.value,),
-                    LDAPFieldName.memberDNs: (LDAPAttribute.uniqueMember.value,),
-                }),
-                recordTypeSchemas=MappingProxyType({
-                    RecordType.user: RecordTypeSchema(
-                        relativeDN=u"ou=People",
-
-                        # (objectClass=inetOrgPerson)
-                        attributes=(
-                            (
-                                LDAPAttribute.objectClass.value,
-                                LDAPObjectClass.inetOrgPerson.value,
-                            ),
-                        ),
-                    ),
-
-                    RecordType.group: RecordTypeSchema(
-                        relativeDN=u"ou=Groups",
-
-                        # (objectClass=groupOfNames)
-                        attributes=(
-                            (
-                                LDAPAttribute.objectClass.value,
-                                LDAPObjectClass.groupOfUniqueNames.value,
-                            ),
-                        ),
-                    ),
-
                 })
             )
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140408/2dc47891/attachment.html>


More information about the calendarserver-changes mailing list