From fe99267cdfdefc9df90daa7d601974ce875a0237 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Mar 12 2010 20:44:02 +0000
Subject: - add documentation for the ticket_lifetime option (#561174)


---

diff --git a/krb5-trunk-tktlifetime.patch b/krb5-trunk-tktlifetime.patch
new file mode 100644
index 0000000..ce4d072
--- /dev/null
+++ b/krb5-trunk-tktlifetime.patch
@@ -0,0 +1,33 @@
+The 'ticket_lifetime' option isn't documented.  RT#6680
+
+Index: doc/admin.texinfo
+===================================================================
+--- doc/admin.texinfo	(revision 23799)
++++ doc/admin.texinfo	(working copy)
+@@ -583,6 +583,11 @@
+ fail if the client machine does not have a keytab.  The default for the
+ flag is @value{DefaultVerifyApReqNofail}.
+ 
++@itemx ticket_lifetime
++The value of this tag is the default lifetime for
++initial tickets.  The default value for the tag is
++@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
+Index: src/config-files/krb5.conf.M
+===================================================================
+--- src/config-files/krb5.conf.M	(revision 23799)
++++ src/config-files/krb5.conf.M	(working copy)
+@@ -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.
diff --git a/krb5.spec b/krb5.spec
index c3dfe57..fe1f1e4 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -13,7 +13,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -91,6 +91,7 @@ Patch95: krb5-1.8-opte.patch
 Patch96: krb5-1.8-exp_warn.patch
 Patch98: krb5-1.8-kpasswd_ccache.patch
 Patch99: krb5-trunk-kpasswd_ipv6.patch
+Patch100: krb5-trunk-tktlifetime.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -288,6 +289,7 @@ popd
 %patch96 -p1 -b .exp_warn
 %patch98 -p1 -b .kpasswd-ccache
 %patch99 -p0 -b .kpasswd-ipv6
+%patch100 -p1 -b .tktlifetime
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -862,6 +864,9 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Fri Mar 12 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.8-3
+- add documentation for the ticket_lifetime option (#561174)
+
 * Mon Mar  8 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.8-2
 - pull up patch to get the client libraries to correctly perform password
   changes over IPv6 (Sumit Bose, RT#6661)