[CalendarServer-changes] [12371] twext/trunk/twext/who/ldap
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:24:34 PDT 2014
Revision: 12371
http://trac.calendarserver.org//changeset/12371
Author: wsanchez at apple.com
Date: 2014-01-16 19:49:12 -0800 (Thu, 16 Jan 2014)
Log Message:
-----------
Add inetOrgPerson
Modified Paths:
--------------
twext/trunk/twext/who/ldap/_constants.py
twext/trunk/twext/who/ldap/_service.py
Modified: twext/trunk/twext/who/ldap/_constants.py
===================================================================
--- twext/trunk/twext/who/ldap/_constants.py 2014-01-17 03:48:40 UTC (rev 12370)
+++ twext/trunk/twext/who/ldap/_constants.py 2014-01-17 03:49:12 UTC (rev 12371)
@@ -189,6 +189,34 @@
+class RFC2798Attribute(Values):
+ """
+ inetOrgPerson object class attributes.
+
+ See U{RFC 2798, section 2<http://tools.ietf.org/html/rfc2798#section-2>}.
+ """
+ carLicense = ValueConstant(u"carLicense")
+ departmentNumber = ValueConstant(u"departmentNumber")
+ displayName = ValueConstant(u"displayName")
+ employeeNumber = ValueConstant(u"employeeNumber")
+ employeeType = ValueConstant(u"employeeType")
+ jpegPhoto = ValueConstant(u"jpegPhoto")
+ preferredLanguage = ValueConstant(u"preferredLanguage")
+ userSMIMECertificate = ValueConstant(u"userSMIMECertificate")
+ userPKCS12 = ValueConstant(u"userPKCS12")
+
+
+
+class RFC2798ObjectClass(Values):
+ """
+ inetOrgPerson object class.
+
+ See U{RFC 2798, section 3<http://tools.ietf.org/html/rfc2798#section-3>}.
+ """
+ inetOrgPerson = ValueConstant(u"inetOrgPerson")
+
+
+
class RFC4519Attribute(Values):
"""
User application attributes.
@@ -325,17 +353,19 @@
LDAPAttribute = ConstantsContainer((
+ RFC2798Attribute,
RFC4519Attribute,
RFC4524Attribute,
WhoAttribute,
))
LDAPObjectClass = ConstantsContainer((
+ RFC2798ObjectClass,
RFC4519ObjectClass,
RFC4524ObjectClass,
))
# http://tools.ietf.org/html/rfc3112 auth schemes
-# http://tools.ietf.org/html/rfc2798 inetOrgPerson
# http://tools.ietf.org/html/rfc2739 calendar
+# http://tools.ietf.org/html/rfc3698 additional matching rules
Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- twext/trunk/twext/who/ldap/_service.py 2014-01-17 03:48:40 UTC (rev 12370)
+++ twext/trunk/twext/who/ldap/_service.py 2014-01-17 03:49:12 UTC (rev 12371)
@@ -62,7 +62,7 @@
# Maps record type -> LDAP object class names
DEFAULT_RECORDTYPE_OBJECTCLASS_MAP = {
- BaseRecordType.user: (LDAPObjectClass.person.value,),
+ BaseRecordType.user: (LDAPObjectClass.inetOrgPerson.value,),
BaseRecordType.group: (LDAPObjectClass.groupOfNames.value,),
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/299119f1/attachment.html>
More information about the calendarserver-changes
mailing list