mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Fix ownertrust display with --with-colons.
Properly initialize the user ID refcount for user and photo IDs. Tweak a few prompts to change "y/n" to "y/N", which is how most other prompts are written. Warn the user if they are about to revoke an expired sig (not a problem, but they should know). Control-d escapes the keyserver search prompt. If a subkey is considered revoked solely because the parent key is revoked, print the revocation reason from the parent key. Allow revocation/expiration to apply to a uid/key with no entry in the trustdb.
This commit is contained in:
parent
1ca0a0ac0b
commit
0f682ed3f7
8 changed files with 82 additions and 28 deletions
|
@ -90,7 +90,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
|
|||
{
|
||||
printf("This JPEG is really large (%d bytes) !\n",len);
|
||||
if(!cpr_get_answer_is_yes("photoid.jpeg.size",
|
||||
_("Are you sure you want to use it (y/n)? ")))
|
||||
_("Are you sure you want to use it (y/N)? ")))
|
||||
{
|
||||
iobuf_close(file);
|
||||
continue;
|
||||
|
@ -118,7 +118,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
|
|||
|
||||
show_photo(uid->attribs,pk);
|
||||
switch(cpr_get_answer_yes_no_quit("photoid.jpeg.okay",
|
||||
_("Is this photo correct (y/n/q)? ")))
|
||||
_("Is this photo correct (y/N/q)? ")))
|
||||
{
|
||||
case -1:
|
||||
goto scram;
|
||||
|
@ -131,6 +131,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
|
|||
}
|
||||
|
||||
error=0;
|
||||
uid->ref=1;
|
||||
|
||||
scram:
|
||||
m_free(filename);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue