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 /tools/gpgconf-comp.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 'tools/gpgconf-comp.c')
| -rw-r--r-- | tools/gpgconf-comp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index fa4ca015f..5a393732d 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -461,7 +461,7 @@ static known_option_t known_options_gpgsm[] = { "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC }, { "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT }, { "p12-charset", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED }, - { "keyserver", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC, + { "ldapserver", GC_OPT_FLAG_LIST, GC_LEVEL_INVISIBLE, GC_ARG_TYPE_LDAP_SERVER }, { "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT }, { "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED }, @@ -505,6 +505,8 @@ static known_option_t known_options_dirmngr[] = { "force", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC }, { "use-tor", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC }, { "keyserver", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC }, + { "ldapserver", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC, + GC_ARG_TYPE_LDAP_SERVER }, { "disable-http", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED }, { "ignore-http-dp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED }, { "http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED }, |