security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Detect a "no keys found" case even if the keyserver helper program does

Browse source 
not explicitly say how many keys were found.

Bug fix - don't report non-revoked keys as revoked in HKP key searches.
This commit is contained in:
David Shaw 2002-02-22 03:11:15 +00:00
parent 8ac8b1525e
commit 393ba4f8a7
3 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
g10/keyserver.c
View file

@ -811,8 +811,9 @@ keyserver_search(STRLIST tokens)
return 0;
}
/* Count is just for cosmetics. If it is too small, it will grow
safely. If negative it disables the "Key x-y of z" messages. */
/* Count and searchstr are just for cosmetics. If the count is too
small, it will grow safely. If negative it disables the "Key x-y
of z" messages. */
void
keyserver_search_prompt(IOBUF buffer,int count,const char *searchstr)
{
@ -823,13 +824,7 @@ keyserver_search_prompt(IOBUF buffer,int count,const char *searchstr)
char *answer;
if(count==0)
{
if(searchstr)
log_info(_("key \"%s\" not found on keyserver\n"),searchstr);
else
log_info(_("key not found on keyserver\n"));
return;
}
goto notfound;
if(count<0)
{
@ -857,7 +852,8 @@ keyserver_search_prompt(IOBUF buffer,int count,const char *searchstr)
if(validcount && (i-1)%10==0)
{
printf("Keys %d-%d of %d",i,(i+9<count)?i+9:count,count);
printf(" for \"%s\"",searchstr);
if(searchstr)
printf(" for \"%s\"",searchstr);
printf("\n");
}
@ -871,6 +867,12 @@ keyserver_search_prompt(IOBUF buffer,int count,const char *searchstr)
else
i--;
if(rl==0 && i==1)
{
count=0;
break;
}
if(i%10==0 || rl==0)
{
answer=cpr_get_no_help("keysearch.prompt",
@ -896,4 +898,14 @@ keyserver_search_prompt(IOBUF buffer,int count,const char *searchstr)
m_free(keyids);
m_free(line);
notfound:
if(count==0)
{
if(searchstr)
log_info(_("key \"%s\" not found on keyserver\n"),searchstr);
else
log_info(_("key not found on keyserver\n"));
return;
}
}