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/options.h | |
| 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/options.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/g10/options.h b/g10/options.h index 2bdbde34f..44ac6e0c0 100644 --- a/g10/options.h +++ b/g10/options.h @@ -103,7 +103,6 @@ struct { const char *set_filename; const char *comment_string; int throw_keyid; - int show_photos; const char *photo_viewer; int s2k_mode; int s2k_digest_algo; @@ -139,6 +138,8 @@ struct { int exec_path_set; unsigned int import_options; unsigned int export_options; + unsigned int list_options; + unsigned int verify_options; char *def_preference_list; prefitem_t *personal_cipher_prefs; prefitem_t *personal_digest_prefs; @@ -150,10 +151,8 @@ struct { int interactive; STRLIST sig_notation_data; STRLIST cert_notation_data; - int show_notation; STRLIST sig_policy_url; STRLIST cert_policy_url; - int show_policy_url; int use_embedded_filename; int allow_non_selfsigned_uid; int allow_freeform_uid; @@ -178,7 +177,6 @@ struct { int no_auto_check_trustdb; int preserve_permissions; int no_homedir_creation; - int show_keyring; struct groupitem *grouplist; int strict; int mangle_dos_filenames; |