svn rev #23827: branches/krb5-1-8/ doc/ src/config-files/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23827
Commit By: tlyu
Log Message:
ticket: 6680
version_fixed: 1.8.1
status: resolved

pull up r23820 from trunk

 ------------------------------------------------------------------------
 r23820 | ghudson | 2010-03-19 09:17:05 -0700 (Fri, 19 Mar 2010) | 7 lines

 ticket: 6680
 target_version: 1.8.1
 tags: pullup

 Document the ticket_lifetime libdefaults setting (which was added in
 r16656, #2656).  Based on a patch from nalin at redhat.com.


Changed Files:
U   branches/krb5-1-8/doc/admin.texinfo
U   branches/krb5-1-8/src/config-files/krb5.conf.M
Modified: branches/krb5-1-8/doc/admin.texinfo
===================================================================
--- branches/krb5-1-8/doc/admin.texinfo	2010-03-23 01:58:15 UTC (rev 23826)
+++ branches/krb5-1-8/doc/admin.texinfo	2010-03-23 01:58:22 UTC (rev 23827)
@@ -516,13 +516,6 @@
 Kerberos.  Use a value of 1 on DCE 1.0.3a systems, and a value of 2 on
 DCE 1.1 systems.  The default value is @value{DefaultCcacheType}.
 
- at ignore
- at itemx tkt_lifetime
-The default lifetime of a ticket.  The default is
- at value{DefaultTktLifetime}.  This is currently not supported by the
-code.
- at end ignore
-
 @itemx dns_lookup_kdc
 Indicate whether DNS SRV records should be used to locate the KDCs and
 other servers for a realm, if they are not listed in the information for
@@ -583,6 +576,11 @@
 fail if the client machine does not have a keytab.  The default for the
 flag is @value{DefaultVerifyApReqNofail}.
 
+ at itemx ticket_lifetime
+The value of this tag is the default lifetime for
+initial tickets.  The default value for the tag is
+ at value{DefaultTktLifetime}.
+
 @itemx renew_lifetime
 The value of this tag is the default renewable lifetime for
 initial tickets.  The default value for the tag is

Modified: branches/krb5-1-8/src/config-files/krb5.conf.M
===================================================================
--- branches/krb5-1-8/src/config-files/krb5.conf.M	2010-03-23 01:58:15 UTC (rev 23826)
+++ branches/krb5-1-8/src/config-files/krb5.conf.M	2010-03-23 01:58:22 UTC (rev 23827)
@@ -220,6 +220,10 @@
 fail if the client machine does not have a keytab.  The default for the
 flag is false.
 
+.IP ticket_lifetime
+The value of this tag is the default lifetime for initial tickets.  The
+default value for the tag is 1 day (1d).
+
 .IP renew_lifetime
 The value of this tag is the default renewable lifetime for initial
 tickets.  The default value for the tag is 0.