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

* ksutil.h, ksutil.c (parse_ks_options): New keyserver-option

Browse source 
exact-email.

* gpgkeys_ldap.c (search_key), gpgkeys_hkp.c (search_key): Use it here
to do an email-only search.
This commit is contained in:
David Shaw 2005-08-18 04:17:20 +00:00
parent 0a3eda24ee
commit e9b444a9d0
5 changed files with 61 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
keyserver/gpgkeys_ldap.c
View file

@ -1141,7 +1141,7 @@ search_key(char *searchkey)
struct keylist *dupelist=NULL;
/* The maximum size of the search, including the optional stuff and
the trailing \0 */
char search[2+12+MAX_LINE+2+15+14+1+1];
char search[2+12+1+MAX_LINE+1+2+15+14+1+1];
char *attrs[]={"pgpcertid","pgpuserid","pgprevoked","pgpdisabled",
"pgpkeycreatetime","pgpkeyexpiretime","modifytimestamp",
"pgpkeysize","pgpkeytype",NULL};
@ -1150,9 +1150,11 @@ search_key(char *searchkey)
/* Build the search string */
sprintf(search,"%s(pgpuserid=*%s*)%s%s%s",
sprintf(search,"%s(pgpuserid=*%s%s%s*)%s%s%s",
(!(opt->flags.include_disabled&&opt->flags.include_revoked))?"(&":"",
opt->flags.exact_email?"<":"",
searchkey,
opt->flags.exact_email?">":"",
opt->flags.include_disabled?"":"(pgpdisabled=0)",
opt->flags.include_revoked?"":"(pgprevoked=0)",
!(opt->flags.include_disabled&&opt->flags.include_revoked)?")":"");
@ -1198,7 +1200,12 @@ search_key(char *searchkey)
}
if(err==LDAP_SIZELIMIT_EXCEEDED)
fprintf(console,"gpgkeys: search results exceeded server limit. First %d results shown.\n",count);
{
if(count==1)
fprintf(console,"gpgkeys: search results exceeded server limit. First %d result shown.\n",count);
else
fprintf(console,"gpgkeys: search results exceeded server limit. First %d results shown.\n",count);
}
free_keylist(dupelist);
dupelist=NULL;