summaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2021-06-09 10:34:14 +0200
committerWerner Koch <wk@gnupg.org>2021-06-16 13:04:34 +0200
commit89df86157e3580aae7e391382f4a5451a192fc68 (patch)
tree1e74af791c7ad2d42bc829b6ab0d9d83bbbcb6f7 /sm
parentdirmngr: Allow to pass no filter args to dirmngr_ldap. (diff)
downloadgnupg2-89df86157e3580aae7e391382f4a5451a192fc68.tar.xz
gnupg2-89df86157e3580aae7e391382f4a5451a192fc68.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 <wk@gnupg.org> (cherry picked from commit d6df1bf84969bf5f5781e33bc1c2f6cb2aee0093)
Diffstat (limited to 'sm')
-rw-r--r--sm/gpgsm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 940d65fec..67cfe2490 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -348,8 +348,9 @@ 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, "keyserver",
+ ARGPARSE_s_s (oKeyServer, "ldapserver",
N_("|SPEC|use this keyserver to lookup keys")),
+ ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
ARGPARSE_s_n (oUseKeyboxd, "use-keyboxd", "@"),