From 39e6e163d4b57f2d7dcbc1af3ba9f27d46e929b2 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 4 Jun 2003 21:21:23 +0000 Subject: Inadvertently left out of the 2003-06-01 checkin --- g10/g10.c | 1 + g10/mainproc.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/g10/g10.c b/g10/g10.c index 8a7f09d13..0f6f36ccd 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -437,6 +437,7 @@ static ARGPARSE_OPTS opts[] = { { oImportOptions, "import-options",2,"@"}, { oExportOptions, "export-options",2,"@"}, { oListOptions, "list-options",2,"@"}, + { oVerifyOptions, "verify-options",2,"@"}, { oCharset, "charset" , 2, N_("|NAME|set terminal charset to NAME") }, { oOptions, "options" , 2, N_("read options from file")}, diff --git a/g10/mainproc.c b/g10/mainproc.c index faba197fe..ec812d757 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1402,8 +1402,15 @@ check_sig_and_print( CTX c, KBNODE node ) if( !rc ) { - show_notation(sig,0,1); - show_policy_url(sig,0,1); + if(opt.verify_options&VERIFY_SHOW_POLICY) + show_policy_url(sig,0,1); + else + show_policy_url(sig,0,2); + + if(opt.verify_options&VERIFY_SHOW_NOTATION) + show_notation(sig,0,1); + else + show_notation(sig,0,2); } if( !rc && is_status_enabled() ) { -- cgit v1.2.3