[svn] GnuPG - r4101 - trunk/keyserver

[svn author dshaw]

Author: dshaw
Date: 2006-04-11 05:13:46 +0200 (Tue, 11 Apr 2006)
New Revision: 4101

Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/gpgkeys_ldap.c
Log:
* gpgkeys_ldap.c (get_name): Build strings with strcat rather than
using sprintf which is harder to read and modify.


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2006-04-11 03:00:50 UTC (rev 4100)
+++ trunk/keyserver/ChangeLog	2006-04-11 03:13:46 UTC (rev 4101)
@@ -1,5 +1,8 @@
 2006-04-10  David Shaw  <dshaw at 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.

Modified: trunk/keyserver/gpgkeys_ldap.c
===================================================================
--- trunk/keyserver/gpgkeys_ldap.c	2006-04-11 03:00:50 UTC (rev 4100)
+++ trunk/keyserver/gpgkeys_ldap.c	2006-04-11 03:13:46 UTC (rev 4101)
@@ -1162,7 +1162,7 @@
   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,13 +1184,24 @@
 
   /* 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);
 
   if(opt->verbose>2)
@@ -1291,7 +1302,7 @@
   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};