security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* gpg.sgml: Document smartcard related options.

Browse source 
* g10.c, options.h: New option --no-interactive-selection.
* keyedit.c (keyedit_menu): Use it.
This commit is contained in:
Werner Koch 2005-06-20 17:03:27 +00:00
parent 059d159657
commit 2d2e2e74b8
13 changed files with 143 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

5
g10/ChangeLog
View file

@ -1,3 +1,8 @@
2005-06-20 Werner Koch <wk@g10code.com>
* g10.c, options.h: New option --no-interactive-selection.
* keyedit.c (keyedit_menu): Use it.
2005-06-18 Werner Koch <wk@g10code.com>
* parse-packet.c (parse_signature): Use log_info for messages

9
g10/g10.c
View file

@ -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;

10
g10/keyedit.c
View file

@ -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))
{

1
g10/options.h
View file

@ -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;