diff options
author | Robbie Harwood <rharwood@redhat.com> | 2020-08-20 17:49:29 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2020-09-02 16:27:45 -0400 |
commit | becd1ad6830b526d08ddaf5b2b6f213154c6446c (patch) | |
tree | fdf5697c35b315945aa2dd75f1f516527d11a7dd /src | |
parent | 6cdf7d82e74f21fb8a37efe6b1bba45744f891ba (diff) | |
download | krb5-becd1ad6830b526d08ddaf5b2b6f213154c6446c.zip krb5-becd1ad6830b526d08ddaf5b2b6f213154c6446c.tar.gz krb5-becd1ad6830b526d08ddaf5b2b6f213154c6446c.tar.bz2 |
Unify kvno option documentation
Add missing kvno options to the kvno.rst synopsis and option
descriptions, and to the kvno usage message. Remove mention of '-h'
(help text), from kvno.rst as it is an implicit option. Note that the
three new caching options were added in release 1.19.
Indicate the two exclusions (-u/-S and --u2u with the S4U2Self options)
and dependency (-P on S4U2Self) where they are missing.
Switch xusage() to print only a single localized string, rather than
running each line of output through localization separately.
Leave kvno -C undocumented for now, as the semantics of
KRB5_GC_CANONICALIZE are minimally useful and likely to change.
[ghudson@mit.edu: edited documentation and commit message]
ticket: 7476
tags: pullup
target_version: 1.18-next
Diffstat (limited to 'src')
-rw-r--r-- | src/clients/kvno/kvno.c | 15 | ||||
-rw-r--r-- | src/man/kvno.man | 24 |
2 files changed, 22 insertions, 17 deletions
diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c index 9d85864..c5f6bf7 100644 --- a/src/clients/kvno/kvno.c +++ b/src/clients/kvno/kvno.c @@ -38,15 +38,18 @@ static char *prog; static int quiet = 0; +#define XUSAGE_BREAK "\n\t" + static void xusage() { - fprintf(stderr, _("usage: %s [-C] [-u] [-c ccache] [-e etype]\n"), prog); - fprintf(stderr, _("\t[-k keytab] [-S sname] [{-I | -U} for_user | " - "[-F cert_file] [-P]]\n")); - fprintf(stderr, _("\t[--cached-only] [--no-store] [--out-cache ccache] " - "[--u2u ccache]\n")); - fprintf(stderr, _("\tservice1 service2 ...\n")); + fprintf(stderr, _("usage: %s [-c ccache] [-e etype] [-k keytab] [-q] " + "[-u | -S sname]" XUSAGE_BREAK + "[[{-F cert_file | {-I | -U} for_user} [-P]] | " + "--u2u ccache]" XUSAGE_BREAK + "[--cached-only] [--no-store] [--out-cache] " + "service1 service2 ...\n"), + prog); exit(1); } diff --git a/src/man/kvno.man b/src/man/kvno.man index 15e44c9..953d168 100644 --- a/src/man/kvno.man +++ b/src/man/kvno.man @@ -36,13 +36,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] [\fB\-c\fP \fIccache\fP] [\fB\-e\fP \fIetype\fP] [\fB\-q\fP] -[\fB\-h\fP] +[\fB\-u\fP | \fB\-S\fP \fIsname\fP] [\fB\-P\fP] -[\fB\-S\fP \fIsname\fP] -[\fB\-I\fP \fIfor_user\fP] -[\fB\-U\fP \fIfor_user\fP] -[\fB\-F\fP \fIcert_file\fP] -[\fB\-\-u2u\fP \fIccache\fP] +[[{\fB\-F\fP \fIcert_file\fP | {\fB\-I\fP | \fB\-U\fP} \fIfor_user\fP} [\fB\-P\fP]] | \fB\-\-u2u\fP \fIccache\fP] \fIservice1 service2\fP ... .SH DESCRIPTION .sp @@ -60,13 +56,18 @@ Specifies the enctype which will be requested for the session key of all the services named on the command line. This is useful in certain backward compatibility situations. .TP +\fB\-k\fP \fIkeytab\fP +Decrypt the acquired tickets using \fIkeytab\fP to confirm their +validity. +.TP \fB\-q\fP Suppress printing output when successful. If a service ticket cannot be obtained, an error message will still be printed and kvno will exit with nonzero status. .TP -\fB\-h\fP -Prints a usage statement and exits. +\fB\-u\fP +Use the unknown name type in requested service principal names. +This option Cannot be used with \fI\-S\fP\&. .TP \fB\-P\fP Specifies that the \fIservice1 service2\fP ... arguments are to be @@ -97,16 +98,17 @@ certificate file must be in PEM format. .TP \fB\-\-cached\-only\fP Only retrieve credentials already present in the cache, not from -the KDC. +the KDC. (Added in release 1.19.) .TP \fB\-\-no\-store\fP Do not store retrieved credentials in the cache. If \fB\-\-out\-cache\fP is also specified, credentials will still be -stored into the output credential cache. +stored into the output credential cache. (Added in release 1.19.) .TP \fB\-\-out\-cache\fP \fIccache\fP Initialize \fIccache\fP and store all retrieved credentials into it. -Do not store acquired credentials in the input cache. +Do not store acquired credentials in the input cache. (Added in +release 1.19.) .TP \fB\-\-u2u\fP \fIccache\fP Requests a user\-to\-user ticket. \fIccache\fP must contain a local |