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_name): Build strings with strcat rather than 

using sprintf which is harder to read and modify.
This commit is contained in:
David Shaw 2006-04-11 03:13:46 +00:00
parent 3011a39284
commit af0a0ae6ee
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyserver/ChangeLog
View File

@ -1,5 +1,8 @@
2006-04-10 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_ldap.c (get_name): Build strings with strcat rather than
using sprintf which is harder to read and modify.
* ksutil.h, ksutil.c (classify_ks_search): Add
KS_SEARCH_KEYID_SHORT and KS_SEARCH_KEYID_LONG to search for a key
ID.

27
keyserver/gpgkeys_ldap.c
View File

@ -1162,7 +1162,7 @@ get_name(char *getkey)
char *expanded_search;
/* The maximum size of the search, including the optional stuff and
the trailing \0 */
char search[2+11+3+MAX_LINE+2+15+14+1+1+20];
char search[2+12+(MAX_LINE*3)+2+15+14+1+1+20];
/* 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. */
@ -1184,12 +1184,23 @@ get_name(char *getkey)
/* Build the search string */
sprintf(search,"%s(pgpuserid=*%s*)%s%s%s",
(!(opt->flags.include_disabled&&opt->flags.include_revoked))?"(&":"",
expanded_search,
opt->flags.include_disabled?"":"(pgpdisabled=0)",
opt->flags.include_revoked?"":"(pgprevoked=0)",
!(opt->flags.include_disabled&&opt->flags.include_revoked)?")":"");
search[0]='\0';
if(!opt->flags.include_disabled || !opt->flags.include_revoked)
strcat(search,"(&");
strcat(search,"(pgpUserID=*");
strcat(search,expanded_search);
strcat(search,"*)");
if(!opt->flags.include_disabled)
strcat(search,"(pgpDisabled=0)");
if(!opt->flags.include_revoked)
strcat(search,"(pgpRevoked=0)");
if(!opt->flags.include_disabled || !opt->flags.include_revoked)
strcat(search,")");
free(expanded_search);
@ -1291,7 +1302,7 @@ search_key(const char *searchkey)
char *expanded_search;
/* The maximum size of the search, including the optional stuff and
the trailing \0 */
char search[2+1+9+1+3+(MAX_LINE*3)+3+1+15+1+1];
char search[2+1+9+1+3+(MAX_LINE*3)+3+1+15+14+1+1+20];
char *attrs[]={"pgpcertid","pgpuserid","pgprevoked","pgpdisabled",
"pgpkeycreatetime","pgpkeyexpiretime","modifytimestamp",
"pgpkeysize","pgpkeytype",NULL};