mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-31 11:41:32 +01:00
* options.h, g10.c (main), keyedit.c (keyedit_menu): Use --interactive
to enable the uid walking when signing a key with no uids specified to sign. * keylist.c (list_keyblock_print): Fix silly typo. Noted by Greg Sabino Mullane.
This commit is contained in:
parent
6f0ed8571b
commit
04b9cec18f
@ -1,3 +1,12 @@
|
||||
2005-07-22 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* options.h, g10.c (main), keyedit.c (keyedit_menu): Use
|
||||
--interactive to enable the uid walking when signing a key with no
|
||||
uids specified to sign.
|
||||
|
||||
* keylist.c (list_keyblock_print): Fix silly typo. Noted by Greg
|
||||
Sabino Mullane.
|
||||
|
||||
2005-07-20 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.c (curl_can_handle): New. Do a runtime check against
|
||||
|
@ -346,7 +346,6 @@ enum cmd_and_opt_values
|
||||
oEnableProgressFilter,
|
||||
oMultifile,
|
||||
oKeyidFormat,
|
||||
oNoInteractiveSelection,
|
||||
oLimitCardInsertTries,
|
||||
|
||||
oReaderPort,
|
||||
@ -677,7 +676,6 @@ static ARGPARSE_OPTS opts[] = {
|
||||
{ oEnableProgressFilter, "enable-progress-filter", 0, "@" },
|
||||
{ oMultifile, "multifile", 0, "@" },
|
||||
{ oKeyidFormat, "keyid-format", 2, "@" },
|
||||
{ oNoInteractiveSelection, "no-interactive-selection", 0, "@" },
|
||||
{ oLimitCardInsertTries, "limit-card-insert-tries", 1, "@"},
|
||||
|
||||
{ oReaderPort, "reader-port", 2, "@"},
|
||||
@ -2545,10 +2543,6 @@ 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 oLimitCardInsertTries:
|
||||
opt.limit_card_insert_tries = pargs.r.ret_int;
|
||||
break;
|
||||
|
@ -1742,12 +1742,15 @@ keyedit_menu( const char *username, STRLIST locusr,
|
||||
_("Really sign all user IDs?"
|
||||
" (y/N) ")))
|
||||
{
|
||||
if (opt.no_interactive_selection)
|
||||
if(opt.interactive)
|
||||
interactive=1;
|
||||
else
|
||||
{
|
||||
tty_printf(_("Hint: Select the user IDs to sign\n"));
|
||||
have_commands = 0;
|
||||
break;
|
||||
}
|
||||
interactive=1;
|
||||
|
||||
}
|
||||
/* What sort of signing are we doing? */
|
||||
if(!parse_sign_type(answer,&localsig,&nonrevokesig,&trustsig))
|
||||
|
@ -790,7 +790,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
|
||||
else if(pk->has_expired)
|
||||
{
|
||||
printf(" [");
|
||||
printf(_("expired: %s)"),expirestr_from_pk(pk));
|
||||
printf(_("expired: %s"),expirestr_from_pk(pk));
|
||||
printf("]");
|
||||
}
|
||||
else if(pk->expiredate)
|
||||
|
@ -157,7 +157,6 @@ 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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user