security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

* gpgkeys_ldap.c (get_key): The deduping code requires "pgpcertid", but 

that was not available when running without verbose on.  Noted by Stefan.
This commit is contained in:
David Shaw 2002-11-14 14:30:53 +00:00
parent 0907db4855
commit d06a95a535
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyserver/ChangeLog
View File

@ -1,3 +1,9 @@
2002-11-14 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_ldap.c (get_key): The deduping code requires
"pgpcertid", but that was not available when running without
verbose on. Noted by Stefan.
2002-11-10 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_ldap.c (get_key): Fix typo in deduping code.

7
keyserver/gpgkeys_ldap.c
View File

@ -272,7 +272,10 @@ get_key(char *getkey)
int ret=KEYSERVER_INTERNAL_ERROR,err,count;
struct keylist *dupelist=NULL;
char search[62];
char *attrs[]={"replaceme","pgpuserid","pgpkeyid","pgpcertid","pgprevoked",
/* This ordering is significant - specifically, "pgpcertid" needs to
be the second item in the list, since everything after it may be
discarded if the user isn't in verbose mode. */
char *attrs[]={"replaceme","pgpcertid","pgpuserid","pgpkeyid","pgprevoked",
"pgpdisabled","pgpkeycreatetime","modifytimestamp",
"pgpkeysize","pgpkeytype",NULL};
attrs[0]=pgpkeystr; /* Some compilers don't like using variables as
@ -331,7 +334,7 @@ get_key(char *getkey)
fprintf(console,"gpgkeys: LDAP fetch for: %s\n",search);
if(!verbose)
attrs[1]=NULL;
attrs[2]=NULL; /* keep only pgpkey(v2) and pgpcertid */
if(verbose)
fprintf(console,"gpgkeys: requesting key 0x%s from ldap://%s%s%s\n",