diff options
| author | David Shaw <[email protected]> | 2003-05-31 23:23:19 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-05-31 23:23:19 +0000 |
| commit | b17358948de8a71e94f59390e128665e7466bb8c (patch) | |
| tree | e3cde5cef2119ae2e05ca0e476a1f6d6e97679c5 /g10/keyedit.c | |
| parent | * main.h, misc.c (parse_options): New general option line parser. Fix the (diff) | |
| download | gnupg-b17358948de8a71e94f59390e128665e7466bb8c.tar.gz gnupg-b17358948de8a71e94f59390e128665e7466bb8c.zip | |
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy,
show_notation): Collapse the old print_notation_data into show_policy()
and show_notation() so there is only one function to print notations and
policy URLs.
* options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig),
keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust),
sign.c (mk_notation_and_policy): New "list-options" and "verify-options"
commands. These replace the existing --show-photos/--no-show-photos,
--show-notation/--no-show-notation,
--show-policy-url/--no-show-policy-url, and --show-keyring options. The
new method is more flexible since a user can specify (for example) showing
photos during sig verification, but not in key listings. The old options
are emulated.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyedit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index e1a0ab83a..d36623a6a 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -161,11 +161,11 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node, } tty_printf("\n"); - if(sig->flags.policy_url && opt.show_policy_url) - show_policy_url(sig,3); + if(sig->flags.policy_url && (opt.list_options&LIST_SHOW_POLICY)) + show_policy_url(sig,3,0); - if(sig->flags.notation && opt.show_notation) - show_notation(sig,3); + if(sig->flags.notation && (opt.list_options&LIST_SHOW_NOTATION)) + show_notation(sig,3,0); } return (sigrc == '!'); |