diff options
| author | Werner Koch <[email protected]> | 2022-01-25 19:22:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-01-25 19:24:25 +0000 |
| commit | 0b4fdbd5f41e1b93a67a65617c7c382c65dfb7c6 (patch) | |
| tree | 7bd16cef6543681fb83dbe3a31bd45af3ef78a50 /sm/gpgsm.c | |
| parent | doc: Add comments on the legacy status of gpgconf.conf. (diff) | |
| download | gnupg-0b4fdbd5f41e1b93a67a65617c7c382c65dfb7c6.tar.gz gnupg-0b4fdbd5f41e1b93a67a65617c7c382c65dfb7c6.zip | |
gpgconf: Return --ldapserver and --keyserver from dirmngr.
* dirmngr/dirmngr.c: Reorder two option groups.
* tools/gpgconf-comp.c (known_options_gpgsm): Rename "keyserver" to
"ldapserver" and set level to invisible.
(known_options_dirmngr): Add "ldapserver" at the basic level.
* sm/gpgsm.c (opts): No more help text for "ldapserver".
--
GnuPG-bug-id: 5800
Diffstat (limited to 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 60e3f741a..bc4bac62e 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -349,8 +349,7 @@ static gpgrt_opt_t opts[] = { ARGPARSE_s_s (oKeyring, "keyring", N_("|FILE|add keyring to the list of keyrings")), ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"), - ARGPARSE_s_s (oKeyServer, "ldapserver", - N_("|SPEC|use this keyserver to lookup keys")), + ARGPARSE_s_s (oKeyServer, "ldapserver", "@"), ARGPARSE_s_s (oKeyServer, "keyserver", "@"), ARGPARSE_s_n (oUseKeyboxd, "use-keyboxd", "@"), |