Cleanup prev commits, fix krbPrincStartTime/pwdStartTime distinction

diff --git a/doc/drafts/draft-chu-ldap-kdc-schema-xx.xml b/doc/drafts/draft-chu-ldap-kdc-schema-xx.xml
index f6c0a45188e4e8d66044661cf0df694092af6397..a544ce19b572f8374622c2e6d622068d94a95c1c 100644 (file)
--- a/doc/drafts/draft-chu-ldap-kdc-schema-xx.xml
+++ b/doc/drafts/draft-chu-ldap-kdc-schema-xx.xml
@@ -14,7 +14,7 @@
        <!ENTITY rfc3672 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3672.xml'>
        <!ENTITY ldapi PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml3/reference.I-D.draft-chu-ldap-ldapi-00.xml'>
        <!ENTITY ppolicy PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml3/reference.I-D.behera-ldap-password-policy.xml'>
-       <!ENTITY kdcmodel PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml3/reference.I-D.draft-ietf-krb-wg-kdc-model-05.xml'>
+       <!ENTITY kdcmodel PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml3/reference.I-D.draft-ietf-krb-wg-kdc-model-06.xml'>
 ]>
 <?xml-stylesheet type='text/xsl' href='rfc2629.xslt' ?>
 <?rfc symrefs="yes" ?>
@@ -108,6 +108,8 @@
             <t>
                krbPrincipalName<vspace blankLines="0"/>
                krbPrincipalAliases<vspace blankLines="0"/>
+               krbPrincStartTime<vspace blankLines="0"/>
+               krbPrincEndTime<vspace blankLines="0"/>
                krbTicketMaxLife<vspace blankLines="0"/>
                krbTicketMaxRenewal<vspace blankLines="0"/>
                krbEncSaltTypes<vspace blankLines="0"/>
@@ -181,7 +183,7 @@
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
                 SINGLE-VALUE )
         </artwork></figure>
-       This attribute impelents section 6.1.1.2 of the Information Model.
+       This attribute implements section 6.1.1.2 of the Information Model.
        It holds the date the principal becomes valid.
        </t>
        <t>
@@ -194,7 +196,7 @@
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
                 SINGLE-VALUE )
         </artwork></figure>
-       This attribute impelents section 6.1.1.3 of the Information Model.
+       This attribute implements section 6.1.1.3 of the Information Model.
        It holds the date the principal becomes invalid.
        </t>
        <t>
@@ -479,25 +481,13 @@
        <t>A number of data elements described in the Information Model are
        delegated to the LDAP DSA for management. Details of their
        usage are described here.</t>
-       <section title="principalNotUsedBefore">
-       <t>Section 6.1.1.2 of the Information Model. This corresponds to the
-       pwdStartTime attribute. If the KDC is using LDAP requests to operate the
-       Password Policy mechanism then it does not need to reference or manipulate
-       this attribute directly.</t>
-       </section>
-       <section title="principalNotUsedAfter">
-       <t>Section 6.1.1.3 of the Information Model. This corresponds to the
-       pwdEndTime attribute. If the KDC is using LDAP requests to operate the
-       Password Policy mechanism then it does not need to reference or manipulate
-       this attribute directly.</t>
-       </section>
        <section title="principalIsDisabled">
        <t>Section 6.1.1.4 of the Information Model.
        If the KDC is using LDAP requests to operate the
        Password Policy mechanism then it does not need to reference or manipulate
        this attribute directly. Otherwise, this effect is controlled by setting
-       the pwdStartTime attribute to a value greater than or equal to the
-       pwdEndTime attribute.</t>
+       the krbPrincStartTime attribute to a value greater than or equal to the
+       krbPrincEndTime attribute.</t>
        </section>
        <section title="principalNumberOfFailedAuthenticationAttempts">
        <t>Section 6.1.1.5 of the Information Model.
@@ -537,6 +527,26 @@
        modifyTimestamp attribute.
        The KDC does not need to reference or manipulate this attribute directly.</t>
        </section>
+       <section title="keyNotUsedAfter">
+       <t>Section 6.3.1.5 of the Information Model. This corresponds to the
+       pwdEndTime attribute. If the KDC is using LDAP requests to operate the
+       Password Policy mechanism then it does not need to reference or manipulate
+       this attribute directly.</t>
+       </section>
+       <section title="keyNotUsedBefore">
+       <t>Section 6.3.1.6 of the Information Model. This corresponds to the
+       pwdStartTime attribute. If the KDC is using LDAP requests to operate the
+       Password Policy mechanism then it does not need to reference or manipulate
+       this attribute directly.</t>
+       </section>
+       <section title="keyIsDisabled">
+       <t>Section 6.3.1.7 of the Information Model.
+       If the KDC is using LDAP requests to operate the
+       Password Policy mechanism then it does not need to reference or manipulate
+       this attribute directly. Otherwise, this effect is controlled by setting
+       the pwdStartTime attribute to a value greater than or equal to the
+       pwdEndTime attribute.</t>
+       </section>
       </section>
        <section title="KeySet details">
        <t>The krbKeySet attribute is multi-valued but it is expected that