security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* options.h, g10.c (main), keyedit.c (keyedit_menu): Use --interactive

Browse Source 
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:
David Shaw 2005-07-22 12:52:34 +00:00
parent 6f0ed8571b
commit 04b9cec18f
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -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> 2005-07-20 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (curl_can_handle): New. Do a runtime check against * keyserver.c (curl_can_handle): New. Do a runtime check against

6
g10/g10.c
View File

@ -346,7 +346,6 @@ enum cmd_and_opt_values
oEnableProgressFilter, oEnableProgressFilter,
oMultifile, oMultifile,
oKeyidFormat, oKeyidFormat,
oNoInteractiveSelection,
oLimitCardInsertTries, oLimitCardInsertTries,
oReaderPort, oReaderPort,
@ -677,7 +676,6 @@ static ARGPARSE_OPTS opts[] = {
{ oEnableProgressFilter, "enable-progress-filter", 0, "@" }, { oEnableProgressFilter, "enable-progress-filter", 0, "@" },
{ oMultifile, "multifile", 0, "@" }, { oMultifile, "multifile", 0, "@" },
{ oKeyidFormat, "keyid-format", 2, "@" }, { oKeyidFormat, "keyid-format", 2, "@" },
{ oNoInteractiveSelection, "no-interactive-selection", 0, "@" },
{ oLimitCardInsertTries, "limit-card-insert-tries", 1, "@"}, { oLimitCardInsertTries, "limit-card-insert-tries", 1, "@"},
{ oReaderPort, "reader-port", 2, "@"}, { oReaderPort, "reader-port", 2, "@"},
@ -2545,10 +2543,6 @@ main (int argc, char **argv )
else else
log_error("unknown keyid-format `%s'\n",pargs.r.ret_str); log_error("unknown keyid-format `%s'\n",pargs.r.ret_str);
break; break;
case oNoInteractiveSelection:
opt.no_interactive_selection = 1;
break;
case oLimitCardInsertTries: case oLimitCardInsertTries:
opt.limit_card_insert_tries = pargs.r.ret_int; opt.limit_card_insert_tries = pargs.r.ret_int;
break; break;

7
g10/keyedit.c
View File

@ -1742,12 +1742,15 @@ keyedit_menu( const char *username, STRLIST locusr,
_("Really sign all user IDs?" _("Really sign all user IDs?"
" (y/N) "))) " (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; have_commands = 0;
break; break;
} }
interactive=1;
} }
/* What sort of signing are we doing? */ /* What sort of signing are we doing? */
if(!parse_sign_type(answer,&localsig,&nonrevokesig,&trustsig)) if(!parse_sign_type(answer,&localsig,&nonrevokesig,&trustsig))

2
g10/keylist.c
View File

@ -790,7 +790,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
else if(pk->has_expired) else if(pk->has_expired)
{ {
printf(" ["); printf(" [");
printf(_("expired: %s)"),expirestr_from_pk(pk)); printf(_("expired: %s"),expirestr_from_pk(pk));
printf("]"); printf("]");
} }
else if(pk->expiredate) else if(pk->expiredate)

1
g10/options.h
View File

@ -157,7 +157,6 @@ struct
char *temp_dir; char *temp_dir;
int no_encrypt_to; int no_encrypt_to;
int interactive; int interactive;
int no_interactive_selection;
STRLIST sig_notation_data; STRLIST sig_notation_data;
STRLIST cert_notation_data; STRLIST cert_notation_data;
STRLIST sig_policy_url; STRLIST sig_policy_url;