diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/g10.c | 9 | ||||
| -rw-r--r-- | g10/keyedit.c | 10 | ||||
| -rw-r--r-- | g10/options.h | 1 |
4 files changed, 21 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 3259effe8..85f998f42 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2005-06-20 Werner Koch <[email protected]> + + * g10.c, options.h: New option --no-interactive-selection. + * keyedit.c (keyedit_menu): Use it. + 2005-06-18 Werner Koch <[email protected]> * parse-packet.c (parse_signature): Use log_info for messages @@ -346,14 +346,14 @@ enum cmd_and_opt_values oEnableProgressFilter, oMultifile, oKeyidFormat, - oNoop, + oNoInteractiveSelection, oReaderPort, octapiDriver, opcscDriver, oDisableCCID, - aTest + oNoop }; @@ -676,6 +676,7 @@ static ARGPARSE_OPTS opts[] = { { oEnableProgressFilter, "enable-progress-filter", 0, "@" }, { oMultifile, "multifile", 0, "@" }, { oKeyidFormat, "keyid-format", 2, "@" }, + { oNoInteractiveSelection, "no-interactive-selection", 0, "@" }, { oReaderPort, "reader-port", 2, "@"}, { octapiDriver, "ctapi-driver", 2, "@"}, @@ -2542,6 +2543,10 @@ main( int argc, char **argv ) else log_error("unknown keyid-format `%s'\n",pargs.r.ret_str); break; + case oNoInteractiveSelection: + opt.no_interactive_selection = 1; + break; + case oNoop: break; default : pargs.err = configfp? 1:2; break; diff --git a/g10/keyedit.c b/g10/keyedit.c index 9f5081342..6b19de4ea 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1741,8 +1741,14 @@ keyedit_menu( const char *username, STRLIST locusr, && !cpr_get_answer_is_yes("keyedit.sign_all.okay", _("Really sign all user IDs?" " (y/N) "))) - interactive=1; - + { + if (opt.no_interactive_selection) + { + have_commands = 0; + break; + } + interactive=1; + } /* What sort of signing are we doing? */ if(!parse_sign_type(answer,&localsig,&nonrevokesig,&trustsig)) { diff --git a/g10/options.h b/g10/options.h index 8635d9b93..0ced05932 100644 --- a/g10/options.h +++ b/g10/options.h @@ -157,6 +157,7 @@ struct char *temp_dir; int no_encrypt_to; int interactive; + int no_interactive_selection; STRLIST sig_notation_data; STRLIST cert_notation_data; STRLIST sig_policy_url; |