From 2dabce51bde8499580583c644f33ba1db5f737ff Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 8 Sep 2003 17:57:09 +0000
Subject: [PATCH] Sync --help.

---
 doc/shishi.texi | 44 ++++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/doc/shishi.texi b/doc/shishi.texi
index 6194314e..1496e4cb 100644
--- a/doc/shishi.texi
+++ b/doc/shishi.texi
@@ -1185,16 +1185,16 @@ Mandatory or optional arguments to long options are also mandatory or optional
 for any corresponding short options.
 
 @example
-Usage: lt-shishi [OPTION...] [CLIENT [SERVER]] [OPTION...]
-  or:  lt-shishi [OPTION...] --list [CLIENT [SERVER]]
-  or:  lt-shishi [OPTION...] --destroy [CLIENT [SERVER]]
-  or:  lt-shishi [OPTION...] --string-to-key
-  or:  lt-shishi [OPTION...]
-
-      --client-name=NAME     Client name. Default is login username. Only for
-                             AS.
+Usage: shishi [OPTION...] [CLIENT [SERVER]] [OPTION...]
+  or:  shishi [OPTION...] --list [CLIENT [SERVER]]
+  or:  shishi [OPTION...] --destroy [CLIENT [SERVER]]
+  or:  shishi [OPTION...] --string-to-key [CLIENT] [OPTION...]
+  or:  shishi [OPTION...]
+Shishi -- A Kerberos 5 implementation
+
+      --client-name=NAME     Client name. Default is login username.
   -d, --destroy              Destroy tickets in local cache, subject to
-                             --server-name limiting.
+                             --client-name and --server-name limiting.
   -e, --endtime=STRING       Specify when ticket validity should expire.  The
                              time syntax may be relative (to the start time),
                              such as "20 hours", or absolute, such as
@@ -1207,15 +1207,16 @@ Usage: lt-shishi [OPTION...] [CLIENT [SERVER]] [OPTION...]
                              found.
       --force-tgs            Force TGS mode. Default is to use TGS iff a TGT is
                              found.
-      --key-value=KEY        Cipher key to decrypt response (discouraged).
+      --forwardable          Get a forwardable ticket, i.e., one that can be
+                             used to get forwarded tickets.
+      --forwarded            Get a forwarded ticket.
   -l, --list                 List tickets in local cache, subject to
                              --server-name limiting.
-      --proxiable            Get a proxiable ticket.  Only valid for initial
-                             authentication, or when the ticket-granting ticket
-                             is proxiable.
+      --proxiable            Get a proxiable ticket, i.e., one that can be used
+                             to get proxy tickets.
+      --proxy                Get a proxy ticket.
       --realm=REALM          Realm of server. Default is DNS domain of local
-                             host. For AS, this also indicates realm of
-                             client.
+                             host. For AS, this also indicates realm of client.
       --renew-till=STRING    Specify renewable life of ticket.  Implies
                              --renewable.  Accepts same time syntax as
                              --endtime.  If --renewable is specified, the
@@ -1234,17 +1235,14 @@ Usage: lt-shishi [OPTION...] [CLIENT [SERVER]] [OPTION...]
                              is to become valid immediately.
       --ticket-granter=NAME  Service name in ticket to use for authenticating
                              request. Only for TGS. Defaults to
-                             "krbtgt/REALM@@REALM" where REALM is server realm
+                             "krbtgt/REALM@REALM" where REALM is server realm
                              (see --realm).
 
  Options for low-level cryptography (CRYPTO-OPTIONS):
       --client-name=NAME     Username. Default is login name.
-      --key-value=KEY        Base64 encoded key value.
-      --key-version=INTEGER  Version number of key.
-      --parameter=STRING     String-to-key parameter to use when --password is
-                             specified. This data is specific for each
-                             encryption algorithm and rarely needed.
-      --password=PASSWORD    Password used to generate key (discouraged).
+      --key-version=INTEGER  Version number of key. Default is 0.
+      --parameter=STRING     String-to-key parameter. This data is specific for
+                             each encryption algorithm and rarely needed.
       --random               Generate key from random data.
       --realm=REALM          Realm of principal. Defaults to DNS domain of
                              local host.
@@ -1255,7 +1253,6 @@ Usage: lt-shishi [OPTION...] [CLIENT [SERVER]] [OPTION...]
                              Convert password into Kerberos key.  Note that
                              --client-name, --realm, and --salt influence the
                              generated key.
-      --write-key-file=FILE  Append cipher key to FILE
 
  Other options:
       --configuration-file=FILE   Read user configuration from file.  Default
@@ -1272,7 +1269,6 @@ Usage: lt-shishi [OPTION...] [CLIENT [SERVER]] [OPTION...]
                              them back to ticket file.
   -v, --verbose              Produce verbose output.  Use multiple times to
                              increase amount of verbose output.
-      --verbose-library      Produce verbose output in the library.
   CLIENT                     Set client name and realm from NAME.  The
                              --client-name and --realm parameters can be used
                              to override part of NAME.
-- 
2.11.4.GIT