mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* keyedit.c (sign_uids): Do not sign expired uids without --expert (same
behavior as revoked uids). * mainproc.c (print_notation_data, check_sig_and_print): Only show the "key available from" preferred keyserver line if the key is not currently present.
This commit is contained in:
parent
6a00a17bd1
commit
75b4e369eb
3 changed files with 46 additions and 9 deletions
|
@ -377,6 +377,26 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
|
|||
tty_printf(_(" Unable to sign.\n"));
|
||||
}
|
||||
}
|
||||
else if(uidnode->pkt->pkt.user_id->is_expired)
|
||||
{
|
||||
tty_printf(_("User ID \"%s\" is expired."),user);
|
||||
|
||||
if(opt.expert)
|
||||
{
|
||||
tty_printf("\n");
|
||||
/* No, so remove the mark and continue */
|
||||
if(!cpr_get_answer_is_yes("sign_uid.expire_okay",
|
||||
_("Are you sure you "
|
||||
"still want to sign "
|
||||
"it? (y/N) ")))
|
||||
uidnode->flag &= ~NODFLG_MARK_A;
|
||||
}
|
||||
else
|
||||
{
|
||||
uidnode->flag &= ~NODFLG_MARK_A;
|
||||
tty_printf(_(" Unable to sign.\n"));
|
||||
}
|
||||
}
|
||||
else if(!uidnode->pkt->pkt.user_id->created)
|
||||
{
|
||||
tty_printf(_("WARNING: user ID \"%s\" is not "
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue