aboutsummaryrefslogtreecommitdiffstats
path: root/sm/gpgsm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sm/gpgsm.c')
-rw-r--r--sm/gpgsm.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index b64324706..8ee0e18c1 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -188,6 +188,7 @@ enum cmd_and_opt_values {
oSkipVerify,
oValidationModel,
oKeyServer,
+ oKeyServer_deprecated,
oEncryptTo,
oNoEncryptTo,
oLoggerFD,
@@ -334,11 +335,9 @@ static ARGPARSE_OPTS 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",
- N_("|SPEC|use this keyserver to lookup keys")),
+ ARGPARSE_s_s (oKeyServer_deprecated, "ldapserver", "@"),
ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
-
ARGPARSE_header ("ImportExport",
N_("Options controlling key import and export")),
@@ -1376,6 +1375,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;