aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-05-14 05:56:10 +0000
committerWerner Koch <[email protected]>2019-05-14 05:57:07 +0000
commit8d645f1d1f2b0f4e2d3b72f2a585acac4bdd8846 (patch)
tree5de087c5544241e650443b3347ce2f5ee7d4a365
parentg10: Fix possible null dereference. (diff)
downloadgnupg-8d645f1d1f2b0f4e2d3b72f2a585acac4bdd8846.tar.gz
gnupg-8d645f1d1f2b0f4e2d3b72f2a585acac4bdd8846.zip
gpg: Do not print a hint to use the deprecated --keyserver option.
* g10/keyserver.c (keyserver_search): Remove a specialized error message. -- Dirmngr comes with a default keyserver and the suggestion to use gpg --keyserver is not good because that option is deprecated. An error message "No keyserver available" is sufficient. GnuPG-bug-id: 4512 Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/keyserver.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 865e1e94b..cadb71fe7 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1537,9 +1537,7 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
log_info (_("key not found on keyserver\n"));
}
- if (gpg_err_code (err) == GPG_ERR_NO_KEYSERVER)
- log_error (_("no keyserver known (use option --keyserver)\n"));
- else if (gpg_err_code (err) == GPG_ERR_NO_DATA)
+ if (gpg_err_code (err) == GPG_ERR_NO_DATA)
err = gpg_error (GPG_ERR_NOT_FOUND);
else if (err)
log_error ("error searching keyserver: %s\n", gpg_strerror (err));