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

* main.h, keylist.c (show_notation): Add argument to show only user

Browse source 
notations, only standard notations, or both.  Change all callers.

* keyserver.c (keyserver_spawn): We still need EXEC_TEMPFILE_ONLY.
This commit is contained in:
David Shaw 2004-04-29 03:42:54 +00:00
parent 75f14e8571
commit 0842905be3
6 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
g10/keylist.c
View file

@ -236,10 +236,14 @@ show_keyserver_url(PKT_signature *sig,int indent,int mode)
mode=0 for stdout.
mode=1 for log_info + status messages
mode=2 for status messages only
which=0 for both standard and user notations
which=1 for standard notations only
which=2 for user notations only
*/
void
show_notation(PKT_signature *sig,int indent,int mode)
show_notation(PKT_signature *sig,int indent,int mode,int which)
{
const byte *p;
size_t len;
@ -259,9 +263,14 @@ show_notation(PKT_signature *sig,int indent,int mode)
if(8+n1+n2!=len)
{
log_info(_("WARNING: invalid notation data found\n"));
return;
continue;
}
if(which==1 && memchr(p+8,'@',n1))
continue;
else if(which==2 && !memchr(p+8,'@',n1))
continue;
if(mode!=2)
{
int i;
@ -864,7 +873,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
if(sig->flags.notation
&& (opt.list_options&LIST_SHOW_NOTATIONS))
show_notation(sig,3,0);
show_notation(sig,3,0,0);
if(sig->flags.pref_ks
&& (opt.list_options&LIST_SHOW_KEYSERVER_URLS))