aboutsummaryrefslogtreecommitdiffstats
path: root/g10/mainproc.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2003-08-26 03:56:47 +0000
committerDavid Shaw <[email protected]>2003-08-26 03:56:47 +0000
commit68aa60e79c080620cb0c95cd6992b8bb0656cf63 (patch)
treee91c32499a2c1404bb60d8d0f1ef3d5c33d1734d /g10/mainproc.c
parent* NEWS: Note %g and %p, the "tru" --with-colons record, and the REVKEYSIG (diff)
downloadgnupg-68aa60e79c080620cb0c95cd6992b8bb0656cf63.tar.gz
gnupg-68aa60e79c080620cb0c95cd6992b8bb0656cf63.zip
* mainproc.c (check_sig_and_print): Use two different preferred keyserver
displays - one if the key is not present (to tell the user where to get the key), the other if it is present (to tell the user where the key can be refreshed). * packet.h, parse-packet.c (parse_signature): Set flag if a preferred keyserver is present. * keylist.c (list_keyblock_print): Show keyserver url in listings with list-option show-keyserver-url.
Diffstat (limited to 'g10/mainproc.c')
-rw-r--r--g10/mainproc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 1762497f8..f92181e2b 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1287,7 +1287,7 @@ check_sig_and_print( CTX c, KBNODE node )
/* If the key still isn't found, try to inform the user where it
can be found. */
- if(rc==G10ERR_NO_PUBKEY && opt.verify_options&VERIFY_SHOW_KEYSERVER)
+ if(rc==G10ERR_NO_PUBKEY && sig->flags.pref_ks)
{
const byte *p;
int seq=0;
@@ -1457,6 +1457,11 @@ check_sig_and_print( CTX c, KBNODE node )
else
show_policy_url(sig,0,2);
+ if(opt.verify_options&VERIFY_SHOW_KEYSERVER)
+ show_keyserver_url(sig,0,1);
+ else
+ show_keyserver_url(sig,0,2);
+
if(opt.verify_options&VERIFY_SHOW_NOTATION)
show_notation(sig,0,1);
else