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
|
@ -144,7 +144,8 @@ parse_keyserver_uri(char *uri)
|
|||
return G10ERR_BAD_URI;
|
||||
}
|
||||
|
||||
/* (any path part of the URI is discarded for now) */
|
||||
/* (any path part of the URI is discarded for now as no keyserver
|
||||
uses it) */
|
||||
|
||||
if(opt.keyserver_scheme[0]=='\0' || opt.keyserver_host[0]=='\0')
|
||||
return G10ERR_BAD_URI;
|
||||
|
@ -152,7 +153,7 @@ parse_keyserver_uri(char *uri)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Unquote only the delimiter character and backslash */
|
||||
/* Unquote only the delimiter character and backslashes (\x5C) */
|
||||
static void
|
||||
printunquoted(char *string,char delim)
|
||||
{
|
||||
|
@ -943,6 +944,13 @@ keyserver_search_prompt(IOBUF buffer,int count,const char *searchstr)
|
|||
{
|
||||
answer=cpr_get_no_help("keysearch.prompt",
|
||||
_("Enter number(s), N)ext, or Q)uit > "));
|
||||
/* control-d */
|
||||
if(answer[0]=='\x04')
|
||||
{
|
||||
printf("Q\n");
|
||||
answer[0]='q';
|
||||
}
|
||||
|
||||
if(answer[0]=='q' || answer[0]=='Q')
|
||||
{
|
||||
m_free(answer);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue