[CalendarServer-changes] [9188] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 9188
          http://trac.macosforge.org/projects/calendarserver/changeset/9188
Author:   dre at apple.com
Date:     2012-04-26 10:48:04 -0700 (Thu, 26 Apr 2012)
Log Message:
-----------
Set default guidAttr to something useful for OpenLDAP as per RFC 4530

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2012-04-26 17:20:12 UTC (rev 9187)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2012-04-26 17:48:04 UTC (rev 9188)
@@ -250,7 +250,7 @@
           <key>base</key>
           <string>dc=example,dc=com</string>
           <key>guidAttr</key>
-          <string>apple-generateduid</string>
+          <string>entryUUID</string>
           <key>users</key>
           <dict>
             <key>rdn</key>

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-04-26 17:20:12 UTC (rev 9187)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-04-26 17:48:04 UTC (rev 9188)
@@ -84,7 +84,7 @@
         "authMethod": "LDAP",
         "rdnSchema": {
             "base": "dc=example,dc=com",
-            "guidAttr": None,
+            "guidAttr": "entryUUID",
             "users": {
                 "rdn": "ou=People",
                 "attr": "uid", # used only to synthesize email address
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120426/7287dc4f/attachment-0001.html>