security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-17 14:07:03 +01:00
Code Activity

sm: New option --ldapserver as an alias for --keyserver.

Browse Source 
* sm/gpgsm.c (opts): Add option --ldapserver and make --keyserver an
alias.
--

We should use "keyserver" for OpenPGP and thus it is better to allow
for "ldapserver" here - it is the same convention as now used in
dirmngr.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2021-06-09 10:34:14 +02:00
parent f6e45671aa
commit d6df1bf849
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/gpgsm.texi
View File

@ -347,6 +347,17 @@ 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}
@itemx --keyserver @var{string}
@opindex ldapserver
@opindex keyserver
Add an LDAP server to use for X.509 certificate and CRL lookup. This
option can be given multiple times to configure more than one LDAP
server. Note that in general @command{dirmngr} should be configured
with the list of LDAP servers; if this option is also configured here,
it is used in addition to those configured in dirmngr. For the syntax
see the description of dirmngr's ldapserver option.
@item --policy-file @var{filename} @item --policy-file @var{filename}
@opindex policy-file @opindex policy-file
Change the default name of the policy file to @var{filename}. Change the default name of the policy file to @var{filename}.

4
sm/gpgsm.c
View File

@ -337,8 +337,10 @@ static ARGPARSE_OPTS opts[] = {
/* N_("use the default key as default recipient")), */ /* N_("use the default key as default recipient")), */
/* ARGPARSE_s_n (oNoDefRecipient, "no-default-recipient", "@"), */ /* ARGPARSE_s_n (oNoDefRecipient, "no-default-recipient", "@"), */
ARGPARSE_s_s (oKeyServer, "keyserver", ARGPARSE_s_s (oKeyServer, "ldapserver",
N_("|SPEC|use this keyserver to lookup keys")), N_("|SPEC|use this keyserver to lookup keys")),
ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")), ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
ARGPARSE_s_s (oDebug, "debug", "@"), ARGPARSE_s_s (oDebug, "debug", "@"),