mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* pkclist.c (build_pk_list): Fix bug that allowed a key to be selected
twice in batch mode if one instance was the default recipient and the other was an encrypt-to. Noted by Stefan Bellon. * parse-packet.c (dump_sig_subpkt): Show data in trust and regexp sig subpackets. * keyedit.c (keyedit_menu): Use new function real_uids_left to prevent deleting the last real (i.e. non-attribute) uid. Again, according to the attribute draft. (menu_showphoto): Make another string translatable.
This commit is contained in:
parent
5005434c7e
commit
9d7b26c784
4 changed files with 52 additions and 6 deletions
|
@ -848,12 +848,20 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
|
|||
if( rc )
|
||||
log_error(_("unknown default recipient `%s'\n"), def_rec );
|
||||
else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use)) ) {
|
||||
/* Mark any_recipients here since the default recipient
|
||||
would have been used if it wasn't already there. It
|
||||
doesn't really matter if we got this key from the default
|
||||
recipient or an encrypt-to. */
|
||||
any_recipients = 1;
|
||||
if (key_present_in_pk_list(pk_list, pk) == 0)
|
||||
log_info(_("skipped: public key already set as default recipient\n"));
|
||||
else {
|
||||
PK_LIST r = m_alloc( sizeof *r );
|
||||
r->pk = pk; pk = NULL;
|
||||
r->next = pk_list;
|
||||
r->mark = 0;
|
||||
pk_list = r;
|
||||
any_recipients = 1;
|
||||
}
|
||||
}
|
||||
if( pk ) {
|
||||
free_public_key( pk );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue