From 32b11e4501b31267cf0e311bfb9eb55db4515e54 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 4 Jul 2002 16:06:38 +0000 Subject: * 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 --- g10/hkp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'g10/hkp.c') diff --git a/g10/hkp.c b/g10/hkp.c index 7b96570cd..4cfb2bf10 100644 --- a/g10/hkp.c +++ b/g10/hkp.c @@ -67,8 +67,10 @@ hkp_ask_import( KEYDB_SEARCH_DESC *desc, void *stats_handle) else return -1; /* HKP does not support v3 fingerprints */ - log_info(_("requesting key %08lX from HKP keyserver %s\n"), - (ulong)key[1],opt.keyserver_host ); + if(opt.keyserver_options.verbose) + log_info(_("requesting key %08lX from %s\n"), + (ulong)key[1],opt.keyserver_uri); + request = m_alloc( strlen( opt.keyserver_host ) + 100 ); /* hkp does not accept the long keyid - we should really write a * nicer one :-) -- cgit v1.2.3