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 /dirmngr | |
| 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 'dirmngr')
| -rw-r--r-- | dirmngr/dirmngr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 8424c4aca..e1983acb9 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -227,7 +227,8 @@ static gpgrt_opt_t opts[] = { N_("|N|do not return more than N items in one query")), ARGPARSE_s_s (oNameServer, "nameserver", "@"), - ARGPARSE_s_s (oKeyServer, "keyserver", "@"), + ARGPARSE_s_s (oKeyServer, "keyserver", + N_("|URL|use keyserver at URL")), ARGPARSE_s_s (oHkpCaCert, "hkp-cacert", N_("|FILE|use the CA certificates in FILE for HKP over TLS")), @@ -250,7 +251,8 @@ static gpgrt_opt_t opts[] = { ARGPARSE_s_s (oHomedir, "homedir", "@"), ARGPARSE_s_s (oLDAPWrapperProgram, "ldap-wrapper-program", "@"), ARGPARSE_s_s (oHTTPWrapperProgram, "http-wrapper-program", "@"), - ARGPARSE_s_n (oHonorHTTPProxy, "honor-http-proxy", "@"), + ARGPARSE_s_n (oHonorHTTPProxy, "honor-http-proxy", + N_("use system's HTTP proxy setting")), ARGPARSE_s_s (oIgnoreCertExtension,"ignore-cert-extension", "@"), ARGPARSE_s_n (oStandardResolver, "standard-resolver", "@"), ARGPARSE_s_n (oRecursiveResolver, "recursive-resolver", "@"), |