diff options
| author | Werner Koch <[email protected]> | 2021-06-09 08:34:14 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-06-09 08:34:14 +0000 |
| commit | d6df1bf84969bf5f5781e33bc1c2f6cb2aee0093 (patch) | |
| tree | 864640e70a9ecf319283f1deda557ad6b0fc4b7c | |
| parent | dirmngr: Allow to pass no filter args to dirmngr_ldap. (diff) | |
| download | gnupg-d6df1bf84969bf5f5781e33bc1c2f6cb2aee0093.tar.gz gnupg-d6df1bf84969bf5f5781e33bc1c2f6cb2aee0093.zip | |
sm: New option --ldapserver as an alias for --keyserver.
* 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 <[email protected]>
| -rw-r--r-- | doc/gpgsm.texi | 11 | ||||
| -rw-r--r-- | sm/gpgsm.c | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index 0900e8709..a3e1bc2e6 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -347,6 +347,17 @@ Outputs additional information while running. You can increase the verbosity by giving several 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} @opindex policy-file Change the default name of the policy file to @var{filename}. diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 3e4f67f4d..5c1f0bb07 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -337,8 +337,10 @@ static ARGPARSE_OPTS opts[] = { /* N_("use the default key as 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")), + ARGPARSE_s_s (oKeyServer, "keyserver", "@"), + ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")), ARGPARSE_s_s (oDebug, "debug", "@"), |