From: Tom Yu <tlyu@mit.edu>
Date: Tue, 26 May 2009 07:58:52 +0000 (+0000)
Subject: pull up r22382 from trunk
X-Git-Tag: krb5-1.7-beta3~4
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=37ce6b279c501ed6168bb27e278431a816380131;p=krb5.git

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.

ticket: 6497
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22386 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/clients/kinit/kinit.M b/src/clients/kinit/kinit.M
index 05a5ae890..fb5a47a25 100644
--- a/src/clients/kinit/kinit.M
+++ b/src/clients/kinit/kinit.M
@@ -131,8 +131,10 @@ the
 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
diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index 42896122a..3f31824b0 100644
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -198,7 +198,7 @@ usage()
 	    "[-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 @@ usage()
     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);
 }