diff options
| author | Werner Koch <wk@gnupg.org> | 2020-03-06 10:09:26 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-03-06 10:09:26 +0100 |
| commit | 4423e9dcde5e1a8d73ff7386942fe3c0c4b917fc (patch) | |
| tree | 9710072dbf310382634379dbe56d4fd900d130f8 /sm/gpgsm.c | |
| parent | gpgconf: Support reading global options (part 1). (diff) | |
| download | gnupg2-4423e9dcde5e1a8d73ff7386942fe3c0c4b917fc.tar.xz gnupg2-4423e9dcde5e1a8d73ff7386942fe3c0c4b917fc.zip | |
gpgconf: Support reading global options (part 2).
* tools/gpgconf-comp.c: Remove all regular option descriptions. They
are now read in from the component. Also remove a few meanwhile
obsolete options.
* agent/gpg-agent.c: Add option description which were only set in
gpgconf-comp.c.
* dirmngr/dirmngr.c: Ditto.
* scd/scdaemon.c: Ditto.
* sm/gpgsm.c: Ditto.
* g10/gpg.c: Ditto.
--
This second part removes all regular option descriptions because they
can be read from the components. A few were missing in the components
and thus moved to there.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 6cea58dd0..283a1f198 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -258,7 +258,8 @@ static gpgrt_opt_t opts[] = { ARGPARSE_s_n (oArmor, "armour", "@"), ARGPARSE_s_n (oBase64, "base64", N_("create base-64 encoded output")), - ARGPARSE_s_s (oP12Charset, "p12-charset", "@"), + ARGPARSE_s_s (oP12Charset, "p12-charset", + N_("|NAME|use encoding NAME for PKCS#12 passphrases")), ARGPARSE_s_i (oPassphraseFD, "passphrase-fd", "@"), ARGPARSE_s_s (oPinentryMode, "pinentry-mode", "@"), @@ -279,7 +280,8 @@ static gpgrt_opt_t opts[] = { N_("never consult a CRL")), ARGPARSE_s_n (oEnableCRLChecks, "enable-crl-checks", "@"), ARGPARSE_s_n (oDisableTrustedCertCRLCheck, - "disable-trusted-cert-crl-check", "@"), + "disable-trusted-cert-crl-check", + N_("do not check CRLs for root certificates")), ARGPARSE_s_n (oEnableTrustedCertCRLCheck, "enable-trusted-cert-crl-check", "@"), @@ -303,7 +305,8 @@ static gpgrt_opt_t opts[] = { ARGPARSE_s_n (oAutoIssuerKeyRetrieve, "auto-issuer-key-retrieve", N_("fetch missing issuer certificates")), - ARGPARSE_s_s (oEncryptTo, "encrypt-to", "@"), + ARGPARSE_s_s (oEncryptTo, "encrypt-to", + N_("|NAME|encrypt to user ID NAME as well")), ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"), ARGPARSE_s_s (oUser, "local-user", @@ -314,7 +317,7 @@ static gpgrt_opt_t opts[] = { ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")), ARGPARSE_s_n (oNoTTY, "no-tty", N_("don't use the terminal at all")), ARGPARSE_s_s (oLogFile, "log-file", - N_("|FILE|write a server mode log to FILE")), + N_("|FILE|write server mode logs to FILE")), ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"), ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"), @@ -387,7 +390,8 @@ static gpgrt_opt_t opts[] = { ARGPARSE_s_s (oLCmessages, "lc-messages", "@"), ARGPARSE_s_s (oXauthority, "xauthority", "@"), ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"), - ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", "@"), + ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", + N_("disable all access to the dirmngr")), ARGPARSE_s_s (oProtectToolProgram, "protect-tool-program", "@"), ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"), ARGPARSE_s_n (oNoBatch, "no-batch", "@"), |