<!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>[12372] twext/trunk/twext/who/ldap/_constants.py</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/12372">12372</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-16 19:50:23 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add RFC2307 constants.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwholdap_constantspy">twext/trunk/twext/who/ldap/_constants.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwholdap_constantspy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_constants.py (12371 => 12372)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_constants.py 2014-01-17 03:49:12 UTC (rev 12371)
+++ twext/trunk/twext/who/ldap/_constants.py 2014-01-17 03:50:23 UTC (rev 12372)
</span><span class="lines">@@ -129,63 +129,63 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-# class RFC2307Attribute(Values):
-# """
-# Network Information Service attributes.
</del><ins>+class RFC2307Attribute(Values):
+ """
+ Network Information Service attributes.
</ins><span class="cx">
</span><del>-# See U{RFC 2307, section 2.2
-# <http://tools.ietf.org/html/rfc2307#section-2.2>}.
-# """
-# uidNumber = ValueConstant(u"uidNumber")
-# gidNumber = ValueConstant(u"gidNumber")
-# gecos = ValueConstant(u"gecos")
-# homeDirectory = ValueConstant(u"homeDirectory")
-# loginShell = ValueConstant(u"loginShell")
-# shadowLastChange = ValueConstant(u"shadowLastChange")
-# shadowMin = ValueConstant(u"shadowMin")
-# shadowMax = ValueConstant(u"shadowMax")
-# shadowWarning = ValueConstant(u"shadowWarning")
-# shadowInactive = ValueConstant(u"shadowInactive")
-# shadowExpire = ValueConstant(u"shadowExpire")
-# shadowFlag = ValueConstant(u"shadowFlag")
-# memberUid = ValueConstant(u"memberUid")
-# memberNisNetgroup = ValueConstant(u"memberNisNetgroup")
-# nisNetgroupTriple = ValueConstant(u"nisNetgroupTriple")
-# ipServicePort = ValueConstant(u"ipServicePort")
-# ipServiceProtocol = ValueConstant(u"ipServiceProtocol")
-# ipProtocolNumber = ValueConstant(u"ipProtocolNumber")
-# oncRpcNumber = ValueConstant(u"oncRpcNumber")
-# ipHostNumber = ValueConstant(u"ipHostNumber")
-# ipNetworkNumber = ValueConstant(u"ipNetworkNumber")
-# ipNetmaskNumber = ValueConstant(u"ipNetmaskNumber")
-# macAddress = ValueConstant(u"macAddress")
-# bootParameter = ValueConstant(u"bootParameter")
-# bootFile = ValueConstant(u"bootFile")
-# nisMapName = ValueConstant(u"nisMapName")
-# nisMapEntry = ValueConstant(u"nisMapEntry")
</del><ins>+ See U{RFC 2307, section 2.2
+ <http://tools.ietf.org/html/rfc2307#section-2.2>}.
+ """
+ uidNumber = ValueConstant(u"uidNumber")
+ gidNumber = ValueConstant(u"gidNumber")
+ gecos = ValueConstant(u"gecos")
+ homeDirectory = ValueConstant(u"homeDirectory")
+ loginShell = ValueConstant(u"loginShell")
+ shadowLastChange = ValueConstant(u"shadowLastChange")
+ shadowMin = ValueConstant(u"shadowMin")
+ shadowMax = ValueConstant(u"shadowMax")
+ shadowWarning = ValueConstant(u"shadowWarning")
+ shadowInactive = ValueConstant(u"shadowInactive")
+ shadowExpire = ValueConstant(u"shadowExpire")
+ shadowFlag = ValueConstant(u"shadowFlag")
+ memberUid = ValueConstant(u"memberUid")
+ memberNisNetgroup = ValueConstant(u"memberNisNetgroup")
+ nisNetgroupTriple = ValueConstant(u"nisNetgroupTriple")
+ ipServicePort = ValueConstant(u"ipServicePort")
+ ipServiceProtocol = ValueConstant(u"ipServiceProtocol")
+ ipProtocolNumber = ValueConstant(u"ipProtocolNumber")
+ oncRpcNumber = ValueConstant(u"oncRpcNumber")
+ ipHostNumber = ValueConstant(u"ipHostNumber")
+ ipNetworkNumber = ValueConstant(u"ipNetworkNumber")
+ ipNetmaskNumber = ValueConstant(u"ipNetmaskNumber")
+ macAddress = ValueConstant(u"macAddress")
+ bootParameter = ValueConstant(u"bootParameter")
+ bootFile = ValueConstant(u"bootFile")
+ nisMapName = ValueConstant(u"nisMapName")
+ nisMapEntry = ValueConstant(u"nisMapEntry")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-# class RFC2307ObjectClass(Values):
-# """
-# Network Information Service object classes.
</del><ins>+class RFC2307ObjectClass(Values):
+ """
+ Network Information Service object classes.
</ins><span class="cx">
</span><del>-# See U{RFC 2307, section 2.3
-# <http://tools.ietf.org/html/rfc2307#section-2.3>}.
-# """
-# posixAccount = ValueConstant(u"posixAccount")
-# shadowAccount = ValueConstant(u"shadowAccount")
-# posixGroup = ValueConstant(u"posixGroup")
-# ipService = ValueConstant(u"ipService")
-# ipProtocol = ValueConstant(u"ipProtocol")
-# oncRpc = ValueConstant(u"oncRpc")
-# ipHost = ValueConstant(u"ipHost")
-# ipNetwork = ValueConstant(u"ipNetwork")
-# nisNetgroup = ValueConstant(u"nisNetgroup")
-# nisMap = ValueConstant(u"nisMap")
-# nisObject = ValueConstant(u"nisObject")
-# ieee802Device = ValueConstant(u"ieee802Device")
-# bootableDevice = ValueConstant(u"bootableDevice")
</del><ins>+ See U{RFC 2307, section 2.3
+ <http://tools.ietf.org/html/rfc2307#section-2.3>}.
+ """
+ posixAccount = ValueConstant(u"posixAccount")
+ shadowAccount = ValueConstant(u"shadowAccount")
+ posixGroup = ValueConstant(u"posixGroup")
+ ipService = ValueConstant(u"ipService")
+ ipProtocol = ValueConstant(u"ipProtocol")
+ oncRpc = ValueConstant(u"oncRpc")
+ ipHost = ValueConstant(u"ipHost")
+ ipNetwork = ValueConstant(u"ipNetwork")
+ nisNetgroup = ValueConstant(u"nisNetgroup")
+ nisMap = ValueConstant(u"nisMap")
+ nisObject = ValueConstant(u"nisObject")
+ ieee802Device = ValueConstant(u"ieee802Device")
+ bootableDevice = ValueConstant(u"bootableDevice")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -353,6 +353,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> LDAPAttribute = ConstantsContainer((
</span><ins>+ RFC2307Attribute,
</ins><span class="cx"> RFC2798Attribute,
</span><span class="cx"> RFC4519Attribute,
</span><span class="cx"> RFC4524Attribute,
</span><span class="lines">@@ -360,6 +361,7 @@
</span><span class="cx"> ))
</span><span class="cx">
</span><span class="cx"> LDAPObjectClass = ConstantsContainer((
</span><ins>+ RFC2307ObjectClass,
</ins><span class="cx"> RFC2798ObjectClass,
</span><span class="cx"> RFC4519ObjectClass,
</span><span class="cx"> RFC4524ObjectClass,
</span></span></pre>
</div>
</div>
</body>
</html>