mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* photoid.c (get_default_photo_command, show_photos): Honor
FIXED_PHOTO_VIEWER and DISABLE_PHOTO_VIEWER. * mainproc.c (check_sig_and_print): Use --show-photos to show photos when verifying a sig made by a key with a photo. * keyserver.c (parse_keyserver_uri): Properly parse a URI with no :port section and an empty file path, but with a terminating '/'. (keyserver_work): Honor DISABLE_KEYSERVER_HELPERS. * hkp.c (hkp_ask_import): Display keyserver URI as a URI, but only if verbose. * exec.c, g10.c: USE_EXEC_PATH -> FIXED_EXEC_PATH
This commit is contained in:
parent
5d74fb31d8
commit
32b11e4501
7 changed files with 46 additions and 6 deletions
|
@ -148,7 +148,7 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno)
|
|||
|
||||
/* Get the host */
|
||||
opt.keyserver_host=strsep(&uri,":/");
|
||||
if(uri==NULL)
|
||||
if(uri==NULL || uri[0]=='\0')
|
||||
opt.keyserver_port="0";
|
||||
else
|
||||
{
|
||||
|
@ -638,6 +638,11 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,int count)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef DISABLE_KEYSERVER_HELPERS
|
||||
log_error(_("external keyserver calls are not supported in this build\n"));
|
||||
return G10ERR_KEYSERVER;
|
||||
#endif
|
||||
|
||||
/* It's not the internal HKP code, so try and spawn a handler for it */
|
||||
|
||||
rc=keyserver_spawn(action,list,desc,count,&ret);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue