svn rev #22386: branches/krb5-1-7/src/clients/kinit/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22386
Commit By: tlyu
Log Message:
ticket: 6497
version_fixed: 1.7

pull up r22382 from trunk
 ------------------------------------------------------------------------
 r22382 | ghudson | 2009-05-25 18:47:40 +0200 (Mon, 25 May 2009) | 6 lines

 ticket: 6497
 tags: pullup
 target_version: 1.7

 Fix up kinit -T documentation.


Changed Files:
U   branches/krb5-1-7/src/clients/kinit/kinit.M
U   branches/krb5-1-7/src/clients/kinit/kinit.c
Modified: branches/krb5-1-7/src/clients/kinit/kinit.M
===================================================================
--- branches/krb5-1-7/src/clients/kinit/kinit.M	2009-05-26 07:58:28 UTC (rev 22385)
+++ branches/krb5-1-7/src/clients/kinit/kinit.M	2009-05-26 07:58:52 UTC (rev 22386)
@@ -131,8 +131,10 @@
 option; otherwise the default name and location will be used.
 .TP
 \fB\-T\fP \fIarmor_ccache\fP
-Specifies the name of a credential cache that already contains a ticket.  This ccache
-will be used to armor the request  Ideally, an attacker should have to attack both the armor ticket and the key of the principal.
+Specifies the name of a credential cache that already contains a
+ticket.  This ccache will be used to armor the request.  Ideally, an
+attacker should have to attack both the armor ticket and the key of
+the principal.
 .TP
 \fB\-c\fP \fIcache_name\fP
 use

Modified: branches/krb5-1-7/src/clients/kinit/kinit.c
===================================================================
--- branches/krb5-1-7/src/clients/kinit/kinit.c	2009-05-26 07:58:28 UTC (rev 22385)
+++ branches/krb5-1-7/src/clients/kinit/kinit.c	2009-05-26 07:58:52 UTC (rev 22386)
@@ -198,7 +198,7 @@
 	    "[-k [-t keytab_file]] "
 	    "[-c cachename] " 
 	    USAGE_BREAK
-	    "[-S service_name]""-T ticket_armor_cache"
+	    "[-S service_name] [-T ticket_armor_cache]"
 	    USAGE_BREAK
 	    "[-X <attribute>[=<value>]] [principal]"
 	    "\n\n", 
@@ -223,6 +223,7 @@
     fprintf(stderr, "\t-t filename of keytab to use\n");
     fprintf(stderr, "\t-c Kerberos 5 cache name\n");
     fprintf(stderr, "\t-S service\n");
+    fprintf(stderr, "\t-T armor credential cache\n");
     fprintf(stderr, "\t-X <attribute>[=<value>]\n");
     exit(2);
 }