security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-12 18:23:04 +01:00
Code Activity

gpg: In search-keys return "Not found" instead of "No Data".

Browse Source 
* g10/keyserver.c (keyserver_search): Check for NO_DATA.
--

GnuPG-bug-id: 3830
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit e7252ae57f3c9da557f23295268f74dd25fee3a1)
This commit is contained in:
Werner Koch 2018-12-11 12:29:58 +01:00
parent dfcc5e6d3e
commit f7ff25edad
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/keyserver.c
View File

@ -1528,7 +1528,7 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
err = gpg_dirmngr_ks_search (ctrl, searchstr, search_line_handler, &parm); err = gpg_dirmngr_ks_search (ctrl, searchstr, search_line_handler, &parm);
if (parm.not_found) if (parm.not_found || gpg_err_code (err) == GPG_ERR_NO_DATA)
{ {
if (parm.searchstr_disp) if (parm.searchstr_disp)
log_info (_("key \"%s\" not found on keyserver\n"), log_info (_("key \"%s\" not found on keyserver\n"),
@ -1539,6 +1539,8 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
if (gpg_err_code (err) == GPG_ERR_NO_KEYSERVER) if (gpg_err_code (err) == GPG_ERR_NO_KEYSERVER)
log_error (_("no keyserver known (use option --keyserver)\n")); log_error (_("no keyserver known (use option --keyserver)\n"));
else if (gpg_err_code (err) == GPG_ERR_NO_DATA)
err = gpg_error (GPG_ERR_NOT_FOUND);
else if (err) else if (err)
log_error ("error searching keyserver: %s\n", gpg_strerror (err)); log_error ("error searching keyserver: %s\n", gpg_strerror (err));