aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2003-06-04 21:21:23 +0000
committerDavid Shaw <[email protected]>2003-06-04 21:21:23 +0000
commit39e6e163d4b57f2d7dcbc1af3ba9f27d46e929b2 (patch)
treee688d52299b55e68827a7e0ca78e1d01a75dd796
parentFix small typo in comment. (diff)
downloadgnupg-39e6e163d4b57f2d7dcbc1af3ba9f27d46e929b2.tar.gz
gnupg-39e6e163d4b57f2d7dcbc1af3ba9f27d46e929b2.zip
Inadvertently left out of the 2003-06-01 checkin
Diffstat (limited to '')
-rw-r--r--g10/g10.c1
-rw-r--r--g10/mainproc.c11
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() ) {