security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

Fix auto-key-retrieve to actually work as a keyserver-option (noted by

Browse Source 
Roger Sondermann).

Do not reorder the primary attribute packet - the first user ID must be a
genuine one.
This commit is contained in:
David Shaw 2002-04-04 03:45:50 +00:00
parent 7e2e0b9950
commit 6be3bee320
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2002-04-03 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (parse_keyserver_options): fix auto-key-retrieve to
actually work as a keyserver-option (noted by Roger Sondermann).
* keylist.c (reorder_keyblock): do not reorder the primary
attribute packet - the first user ID must be a genuine one.
2002-03-31 David Shaw <dshaw@jabberwocky.com> 2002-03-31 David Shaw <dshaw@jabberwocky.com>
* keylist.c (list_keyblock_colon): Fix ownertrust display with * keylist.c (list_keyblock_colon): Fix ownertrust display with

11
g10/keylist.c
View File

@ -781,9 +781,9 @@ list_keyblock_colon( KBNODE keyblock, int secret )
} }
/* /*
* Reorder the keyblock so that the primary user ID comes first. * Reorder the keyblock so that the primary user ID (and not attribute
* Fixme: Replace this by a generic sort function. * packet) comes first. Fixme: Replace this by a generic sort
*/ * function. */
static void static void
reorder_keyblock (KBNODE keyblock) reorder_keyblock (KBNODE keyblock)
{ {
@ -791,8 +791,9 @@ reorder_keyblock (KBNODE keyblock)
KBNODE last, node; KBNODE last, node;
for (node=keyblock; node; primary0=node, node = node->next) { for (node=keyblock; node; primary0=node, node = node->next) {
if( node->pkt->pkttype == PKT_USER_ID if( node->pkt->pkttype == PKT_USER_ID &&
&& node->pkt->pkt.user_id->is_primary ) { !node->pkt->pkt.user_id->attrib_data &&
node->pkt->pkt.user_id->is_primary ) {
primary = primary2 = node; primary = primary2 = node;
for (node=node->next; node; primary2=node, node = node->next ) { for (node=node->next; node; primary2=node, node = node->next ) {
if( node->pkt->pkttype == PKT_USER_ID if( node->pkt->pkttype == PKT_USER_ID

4
g10/keyserver.c
View File

@ -91,9 +91,9 @@ parse_keyserver_options(char *options)
else if(strcasecmp(tok,"no-refresh-add-fake-v3-keyids")==0) else if(strcasecmp(tok,"no-refresh-add-fake-v3-keyids")==0)
opt.keyserver_options.refresh_add_fake_v3_keyids=0; opt.keyserver_options.refresh_add_fake_v3_keyids=0;
else if(strcasecmp(tok,"auto-key-retrieve")==0) else if(strcasecmp(tok,"auto-key-retrieve")==0)
opt.keyserver_options.refresh_add_fake_v3_keyids=1; opt.keyserver_options.auto_key_retrieve=1;
else if(strcasecmp(tok,"no-auto-key-retrieve")==0) else if(strcasecmp(tok,"no-auto-key-retrieve")==0)
opt.keyserver_options.refresh_add_fake_v3_keyids=0; opt.keyserver_options.auto_key_retrieve=0;
else if(strlen(tok)>0) else if(strlen(tok)>0)
add_to_strlist(&opt.keyserver_options.other,tok); add_to_strlist(&opt.keyserver_options.other,tok);