From 0b4fdbd5f41e1b93a67a65617c7c382c65dfb7c6 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 25 Jan 2022 20:22:46 +0100 Subject: 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 --- sm/gpgsm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sm/gpgsm.c') 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", "@"), -- cgit v1.2.3