<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14811] CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14811">14811</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-21 10:31:51 -0700 (Thu, 21 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Support for fetching auto-schedule-mode from LDAP</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtwistedcaldavdirectoryldapdirectorypy">CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/directory/ldapdirectory.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtwistedcaldavstdconfigpy">CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/stdconfig.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer54devtwistedcaldavdirectoryldapdirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/directory/ldapdirectory.py (14810 => 14811)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/directory/ldapdirectory.py        2015-05-20 19:54:29 UTC (rev 14810)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/directory/ldapdirectory.py        2015-05-21 17:31:51 UTC (rev 14811)
</span><span class="lines">@@ -183,6 +183,7 @@
</span><span class="cx">                 # individually:
</span><span class="cx">                 &quot;autoScheduleAttr&quot;: None,
</span><span class="cx">                 &quot;autoScheduleEnabledValue&quot;: &quot;yes&quot;,
</span><ins>+                &quot;autoScheduleModeAttr&quot;: None, # must match augment.allowedAutoScheduleModes
</ins><span class="cx">                 &quot;proxyAttr&quot;: None, # list of GUIDs
</span><span class="cx">                 &quot;readOnlyProxyAttr&quot;: None, # list of GUIDs
</span><span class="cx">                 &quot;autoAcceptGroupAttr&quot;: None, # single group GUID
</span><span class="lines">@@ -267,6 +268,8 @@
</span><span class="cx">             attrSet.add(self.resourceSchema[&quot;resourceInfoAttr&quot;])
</span><span class="cx">         if self.resourceSchema[&quot;autoScheduleAttr&quot;]:
</span><span class="cx">             attrSet.add(self.resourceSchema[&quot;autoScheduleAttr&quot;])
</span><ins>+        if self.resourceSchema[&quot;autoScheduleModeAttr&quot;]:
+            attrSet.add(self.resourceSchema[&quot;autoScheduleModeAttr&quot;])
</ins><span class="cx">         if self.resourceSchema[&quot;autoAcceptGroupAttr&quot;]:
</span><span class="cx">             attrSet.add(self.resourceSchema[&quot;autoAcceptGroupAttr&quot;])
</span><span class="cx">         if self.resourceSchema[&quot;proxyAttr&quot;]:
</span><span class="lines">@@ -816,6 +819,7 @@
</span><span class="cx">         proxyGUIDs = ()
</span><span class="cx">         readOnlyProxyGUIDs = ()
</span><span class="cx">         autoSchedule = False
</span><ins>+        autoScheduleMode = None
</ins><span class="cx">         autoAcceptGroup = &quot;&quot;
</span><span class="cx">         memberGUIDs = []
</span><span class="cx"> 
</span><span class="lines">@@ -886,6 +890,9 @@
</span><span class="cx">                         self.resourceSchema[&quot;autoScheduleAttr&quot;])
</span><span class="cx">                     autoSchedule = (autoScheduleValue ==
</span><span class="cx">                         self.resourceSchema[&quot;autoScheduleEnabledValue&quot;])
</span><ins>+                if self.resourceSchema[&quot;autoScheduleModeAttr&quot;]:
+                    autoScheduleMode = self._getUniqueLdapAttribute(attrs,
+                        self.resourceSchema[&quot;autoScheduleModeAttr&quot;])
</ins><span class="cx">                 if self.resourceSchema[&quot;proxyAttr&quot;]:
</span><span class="cx">                     proxyGUIDs = set(self._getMultipleLdapAttributes(attrs,
</span><span class="cx">                         self.resourceSchema[&quot;proxyAttr&quot;]))
</span><span class="lines">@@ -960,6 +967,7 @@
</span><span class="cx">                 partitionID=partitionID,
</span><span class="cx">                 enabledForCalendaring=enabledForCalendaring,
</span><span class="cx">                 autoSchedule=autoSchedule,
</span><ins>+                autoScheduleMode=autoScheduleMode,
</ins><span class="cx">                 autoAcceptGroup=autoAcceptGroup,
</span><span class="cx">                 enabledForAddressBooks=enabledForAddressBooks, # TODO: add to LDAP?
</span><span class="cx">                 enabledForLogin=enabledForLogin,
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/stdconfig.py (14810 => 14811)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/stdconfig.py        2015-05-20 19:54:29 UTC (rev 14810)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/stdconfig.py        2015-05-21 17:31:51 UTC (rev 14811)
</span><span class="lines">@@ -154,8 +154,17 @@
</span><span class="cx">             &quot;memberIdAttr&quot;: None, # which attribute the above refer to
</span><span class="cx">         },
</span><span class="cx">         &quot;resourceSchema&quot;: {
</span><del>-            &quot;resourceInfoAttr&quot;: None, # contains location/resource info
-            &quot;autoAcceptGroupAttr&quot;: None, # auto accept group
</del><ins>+            # Either set this attribute to retrieve the plist version
+            # of resource-info, as in a Leopard OD server, or...
+            &quot;resourceInfoAttr&quot;: None,
+            # ...set the above to None and instead specify these
+            # individually:
+            &quot;autoScheduleAttr&quot;: None,
+            &quot;autoScheduleEnabledValue&quot;: &quot;yes&quot;,
+            &quot;autoScheduleModeAttr&quot;: None, # must match augment.allowedAutoScheduleModes
+            &quot;proxyAttr&quot;: None, # list of GUIDs
+            &quot;readOnlyProxyAttr&quot;: None, # list of GUIDs
+            &quot;autoAcceptGroupAttr&quot;: None, # single group GUID
</ins><span class="cx">         },
</span><span class="cx">         &quot;partitionSchema&quot;: {
</span><span class="cx">             &quot;serverIdAttr&quot;: None, # maps to augments server-id
</span></span></pre>
</div>
</div>

</body>
</html>