Inadvertently left out of the 2003-06-01 checkin
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 4 Jun 2003 21:21:23 +0000 (21:21 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 4 Jun 2003 21:21:23 +0000 (21:21 +0000)
g10/g10.c
g10/mainproc.c

index 8a7f09d..0f6f36c 100644 (file)
--- 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")},
 
index faba197..ec812d7 100644 (file)
@@ -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() ) {