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

gpg: Let --fetch-key return an exit code on failure.

Browse Source 
* g10/keyserver.c (keyserver_fetch): Return an error code.
* g10/gpg.c (main) <aFetchKeys>: Return 1 in case of no data.
--

GnuPG-bug-id: 5376
This commit is contained in:
Werner Koch 2021-06-25 09:55:27 +02:00
parent b90c55fa66
commit 5fe4b97887
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/gpg.c
View File

@ -4699,12 +4699,14 @@ main (int argc, char **argv)
for( ; argc; argc--, argv++ ) for( ; argc; argc--, argv++ )
append_to_strlist2( &sl, *argv, utf8_strings ); append_to_strlist2( &sl, *argv, utf8_strings );
rc = keyserver_fetch (ctrl, sl, opt.key_origin); rc = keyserver_fetch (ctrl, sl, opt.key_origin);
free_strlist (sl);
if(rc) if(rc)
{ {
write_status_failure ("fetch-keys", rc); write_status_failure ("fetch-keys", rc);
log_error ("key fetch failed: %s\n",gpg_strerror (rc)); log_error ("key fetch failed: %s\n",gpg_strerror (rc));
if (gpg_err_code (rc) == GPG_ERR_NO_DATA)
g10_exit (1); /* In this case return 1 and not 2. */
} }
free_strlist(sl);
break; break;
case aExportSecret: case aExportSecret:

20
g10/keyserver.c
View File

@ -1667,6 +1667,8 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist, int origin)
strlist_t sl; strlist_t sl;
estream_t datastream; estream_t datastream;
unsigned int save_options = opt.keyserver_options.import_options; unsigned int save_options = opt.keyserver_options.import_options;
int any_success = 0;
gpg_error_t firsterr = 0;
/* Switch on fast-import, since fetch can handle more than one /* Switch on fast-import, since fetch can handle more than one
import and we don't want each set to rebuild the trustdb. import and we don't want each set to rebuild the trustdb.
@ -1690,13 +1692,25 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist, int origin)
import_print_stats (stats_handle); import_print_stats (stats_handle);
import_release_stats_handle (stats_handle); import_release_stats_handle (stats_handle);
any_success = 1;
} }
else else
log_info (_("WARNING: unable to fetch URI %s: %s\n"), {
sl->d, gpg_strerror (err)); log_info (_("WARNING: unable to fetch URI %s: %s\n"),
sl->d, gpg_strerror (err));
if (!firsterr)
firsterr = err;
}
es_fclose (datastream); es_fclose (datastream);
} }
if (!urilist)
err = gpg_error (GPG_ERR_NO_NAME);
else if (any_success)
err = 0;
else
err = firsterr;
opt.keyserver_options.import_options = save_options; opt.keyserver_options.import_options = save_options;
/* If the original options didn't have fast import, and the trustdb /* If the original options didn't have fast import, and the trustdb
@ -1704,7 +1718,7 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist, int origin)
if (!(opt.keyserver_options.import_options&IMPORT_FAST)) if (!(opt.keyserver_options.import_options&IMPORT_FAST))
check_or_update_trustdb (ctrl); check_or_update_trustdb (ctrl);
return 0; return err;
} }