security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-02 22:38:02 +02:00
Code Activity

gpgsm: Retire the new --ldapserver.

Browse Source 
* 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
This commit is contained in:
Werner Koch 2022-01-27 15:13:16 +01:00
parent ed798a97f5
commit f2d1187fcd
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/gpgsm.texi
View File

@ -358,16 +358,14 @@ Outputs additional information while running.
You can increase the verbosity by giving several You can increase the verbosity by giving several
verbose commands to @command{gpgsm}, such as @samp{-vv}. verbose commands to @command{gpgsm}, such as @samp{-vv}.
@item --ldapserver @var{string} @item --keyserver @var{string}
@itemx --keyserver @var{string}
@opindex ldapserver
@opindex keyserver @opindex keyserver
Add an LDAP server to use for X.509 certificate and CRL lookup. This This is a deprecated option. It was used to add an LDAP server to use
option can be given multiple times to configure more than one LDAP for X.509 certificate and CRL lookup. The alias @option{--ldapserver}
server. Note that in general @command{dirmngr} should be configured existed from version 2.2.28 to 2.2.33 and 2.3.2 to 2.3.4 but is now
with the list of LDAP servers; if this option is also configured here, entirely ignored.
it is used in addition to those configured in dirmngr. For the syntax
see the description of dirmngr's ldapserver option. LDAP servers must be given in the configuration for @command{dirmngr}.
@item --policy-file @var{filename} @item --policy-file @var{filename}
@opindex policy-file @opindex policy-file

7
sm/gpgsm.c
View File

@ -193,6 +193,7 @@ enum cmd_and_opt_values {
oSkipVerify, oSkipVerify,
oValidationModel, oValidationModel,
oKeyServer, oKeyServer,
oKeyServer_deprecated,
oEncryptTo, oEncryptTo,
oNoEncryptTo, oNoEncryptTo,
oLoggerFD, oLoggerFD,
@ -349,7 +350,7 @@ static gpgrt_opt_t opts[] = {
ARGPARSE_s_s (oKeyring, "keyring", ARGPARSE_s_s (oKeyring, "keyring",
N_("|FILE|add keyring to the list of keyrings")), N_("|FILE|add keyring to the list of keyrings")),
ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"), 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_s (oKeyServer, "keyserver", "@"),
ARGPARSE_s_n (oUseKeyboxd, "use-keyboxd", "@"), ARGPARSE_s_n (oUseKeyboxd, "use-keyboxd", "@"),
@ -1418,6 +1419,10 @@ main ( int argc, char **argv)
append_to_strlist (&opt.keyserver, pargs.r.ret_str); append_to_strlist (&opt.keyserver, pargs.r.ret_str);
break; break;
case oKeyServer_deprecated:
obsolete_option (configname, pargs.lineno, "ldapserver");
break;
case oIgnoreCertExtension: case oIgnoreCertExtension:
add_to_strlist (&opt.ignored_cert_extensions, pargs.r.ret_str); add_to_strlist (&opt.ignored_cert_extensions, pargs.r.ret_str);
break; break;