diff options
| author | Werner Koch <[email protected]> | 2022-01-27 14:13:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-01-27 14:23:42 +0000 |
| commit | f2d1187fcde3290ee8133fed256a711cb0b0715c (patch) | |
| tree | d6d0dcd3c0521d4bd6d75daf2b409b37aa90365a /sm/gpgsm.c | |
| parent | gpgconf: Teach --show-config the legacy gpgconf.conf. (diff) | |
| download | gnupg-f2d1187fcde3290ee8133fed256a711cb0b0715c.tar.gz gnupg-f2d1187fcde3290ee8133fed256a711cb0b0715c.zip | |
gpgsm: Retire the new --ldapserver.
* sm/gpgsm.c (oKeyServer_deprecated): New.
(opts): Assign "ldapserver" to the new option and mark it as obsolete.
--
We want to use "ldapserver" in dirmngr but need to keep using
"keyserver" in gpgsm for existant versions of Kleopatra etc.
GnuPG-bug-id: 5801
Diffstat (limited to 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index bc4bac62e..b95edf83b 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -193,6 +193,7 @@ enum cmd_and_opt_values { oSkipVerify, oValidationModel, oKeyServer, + oKeyServer_deprecated, oEncryptTo, oNoEncryptTo, oLoggerFD, @@ -349,7 +350,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", "@"), + ARGPARSE_s_s (oKeyServer_deprecated, "ldapserver", "@"), ARGPARSE_s_s (oKeyServer, "keyserver", "@"), ARGPARSE_s_n (oUseKeyboxd, "use-keyboxd", "@"), @@ -1418,6 +1419,10 @@ main ( int argc, char **argv) append_to_strlist (&opt.keyserver, pargs.r.ret_str); break; + case oKeyServer_deprecated: + obsolete_option (configname, pargs.lineno, "ldapserver"); + break; + case oIgnoreCertExtension: add_to_strlist (&opt.ignored_cert_extensions, pargs.r.ret_str); break; |