From: Zhanna Tsitkov <tsitkova@mit.edu>
Date: Thu, 14 Jun 2012 18:46:10 +0000 (-0400)
Subject: Document allowed time formats for kinit and ksu
X-Git-Tag: krb5-1.11-alpha1~503
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b416279e55afb941a0ddda33026a0ab0314f6f2;p=thirdparty%2Fkrb5.git

Document allowed time formats for kinit and ksu
---

diff --git a/doc/rst_source/krb_users/user_commands/kinit.rst b/doc/rst_source/krb_users/user_commands/kinit.rst
index fe413fbb3e..eae4246dac 100644
--- a/doc/rst_source/krb_users/user_commands/kinit.rst
+++ b/doc/rst_source/krb_users/user_commands/kinit.rst
@@ -42,9 +42,15 @@ OPTIONS
     display verbose output.
 
 **-l** *lifetime*
-    requests a ticket with the lifetime *lifetime*.  The integer value
-    for *lifetime* must be followed immediately by one of the
-    following delimiters:
+    requests a ticket with the lifetime *lifetime*.  The valid formats
+    for *lifetime* are:
+
+     ::
+
+        h:m:s
+        NdNhNmNs
+
+    where
 
      ::
 
@@ -52,24 +58,27 @@ OPTIONS
         m  minutes
         h  hours
         d  days
+        N  number
 
-    as in ``kinit -l 90m``.  You cannot mix units; a value of
-    ``3h30m`` will result in an error.
+    For example, ``kinit -l 5:30`` or ``kinit -l 5h30m``.
 
     If the **-l** option is not specified, the default ticket lifetime
     (configured by each site) is used.  Specifying a ticket lifetime
     longer than the maximum ticket lifetime (configured by each site)
-    results in a ticket with the maximum lifetime.
+    will not override the configured maximum ticket lifetime.
 
 **-s** *start_time*
-    requests a postdated ticket, valid starting at *start_time*.
-    Postdated tickets are issued with the **invalid** flag set, and
-    need to be resubmitted to the KDC for validation before use.
+    requests a postdated ticket.  Postdated tickets are issued with the
+    **invalid** flag set, and need to be resubmitted to the KDC for
+    validation before use.
+
+    *start-time* specifies the duration of the delay before the ticket
+    can become valid using the same time format as the  **-l** option.
 
 **-r** *renewable_life*
     requests renewable tickets, with a total lifetime of
     *renewable_life*.  The duration is in the same format as the
-    **-l** option, with the same delimiters.
+    **-l** option.
 
 **-f**
     requests forwardable tickets.
diff --git a/doc/rst_source/krb_users/user_commands/ksu.rst b/doc/rst_source/krb_users/user_commands/ksu.rst
index d6075629cd..2c2177a240 100644
--- a/doc/rst_source/krb_users/user_commands/ksu.rst
+++ b/doc/rst_source/krb_users/user_commands/ksu.rst
@@ -260,13 +260,28 @@ Ticket granting ticket options:
 
 **-l** *lifetime*
     specifies the lifetime to be requested for the ticket; if this
-    option is not specified, the default ticket lifetime (configured
-    by each site) is used instead.
+    option is not specified, the default ticket lifetime (12 hours)
+    is used instead.  The valid formats for *lifetime* are:
+
+     ::
+
+        h:m:s
+        NdNhNmNs
+
+    where
+
+     ::
+
+        s  seconds
+        m  minutes
+        h  hours
+        d  days
+        N  number
 
 **-r** *time*
     specifies that the **renewable** option should be requested for
     the ticket, and specifies the desired total lifetime of the
-    ticket.
+    ticket using the same time format as the  **-l** option.
 
 **-p**
     specifies that the **proxiable** option should be requested for