[CalendarServer-changes] [15488] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15488
          http://trac.calendarserver.org//changeset/15488
Author:   sagen at apple.com
Date:     2016-03-30 16:32:09 -0700 (Wed, 30 Mar 2016)
Log Message:
-----------
Allow LDAP to useTLS

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

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2016-03-30 17:23:17 UTC (rev 15487)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2016-03-30 23:32:09 UTC (rev 15488)
@@ -67,6 +67,7 @@
     "ldap": {
         "recordTypes": ["users", "groups"],
         "uri": "ldap://localhost/",
+        "useTLS": False,
         "credentials": {
             "dn": None,
             "password": None,

Modified: CalendarServer/trunk/txdav/who/util.py
===================================================================
--- CalendarServer/trunk/txdav/who/util.py	2016-03-30 17:23:17 UTC (rev 15487)
+++ CalendarServer/trunk/txdav/who/util.py	2016-03-30 23:32:09 UTC (rev 15488)
@@ -144,6 +144,7 @@
             directory = LDAPDirectoryService(
                 params.uri,
                 params.rdnSchema.base,
+                useTLS=params.useTLS,
                 credentials=creds,
                 fieldNameToAttributesMap=MappingProxyType({
                     BaseFieldName.uid: mapping.uid,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160330/8d37c836/attachment.html>