From 360534bde770f4845669de223154216d249b954b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 14 Jan 2016 12:22:33 +0100 Subject: [PATCH] gpg: Make --list-options show-usage the default. * g10/gpg.c (main): Add LIST_SHOW_USAGE. -- The usage flags are often useful and they don't take away much space in a key listing. Thus it is better to have them enabled by default. Signed-off-by: Werner Koch --- doc/gpg.texi | 6 ++---- g10/gpg.c | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/gpg.texi b/doc/gpg.texi index 5510d5724..4a70856c7 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -407,9 +407,7 @@ output can directly be added to ssh's @file{authorized_key} file. By specifying the key to export using a key ID or a fingerprint suffixed with an exclamation mark (!), a specific subkey or the primary key can be exported. This does not even require that the key -has the authentication capability flag set. To view the capability -flags of a key use @code{--list-options show-usage} along with a key -listing command. +has the authentication capability flag set. @item --import @itemx --fast-import @@ -1098,7 +1096,7 @@ give the opposite meaning. The options are: Show usage information for keys and subkeys in the standard key listing. This is a list of letters indicating the allowed usage for a key (@code{E}=encryption, @code{S}=signing, @code{C}=certification, - @code{A}=authentication). Defaults to no. + @code{A}=authentication). Defaults to yes. @item show-policy-urls @opindex list-options:show-policy-urls diff --git a/g10/gpg.c b/g10/gpg.c index 4287bda1a..3532550bb 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -2226,7 +2226,8 @@ main (int argc, char **argv) | VERIFY_SHOW_POLICY_URLS | VERIFY_SHOW_STD_NOTATIONS | VERIFY_SHOW_KEYSERVER_URLS); - opt.list_options = LIST_SHOW_UID_VALIDITY; + opt.list_options = (LIST_SHOW_UID_VALIDITY + | LIST_SHOW_USAGE); #ifdef NO_TRUST_MODELS opt.trust_model = TM_ALWAYS; #else