From 68aa60e79c080620cb0c95cd6992b8bb0656cf63 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 26 Aug 2003 03:56:47 +0000 Subject: * 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. --- g10/mainproc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'g10/mainproc.c') 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 -- cgit