[svn] GnuPG - r4359 - branches/STABLE-BRANCH-1-4/keyserver

[svn author dshaw]

Author: dshaw
Date: 2006-12-03 06:57:57 +0100 (Sun, 03 Dec 2006)
New Revision: 4359

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
Log:
* gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be present
when searching by keyID.


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2006-12-03 04:54:21 UTC (rev 4358)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2006-12-03 05:57:57 UTC (rev 4359)
@@ -1,3 +1,8 @@
+2006-12-03  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be
+	present when searching by keyID.
+
 2006-11-05  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_hkp.c (curl_mrindex_writer): Revert previous change.

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2006-12-03 04:54:21 UTC (rev 4358)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2006-12-03 05:57:57 UTC (rev 4359)
@@ -426,6 +426,12 @@
     strcat(request,"11371");
   strcat(request,opt->path);
   append_path(request,"/pks/lookup?op=index&options=mr&search=");
+
+  /* HKP keyservers like the 0x to be present when searching by
+     keyid */
+  if(search_type==KS_SEARCH_KEYID_SHORT || search_type==KS_SEARCH_KEYID_LONG)
+    strcat(request,"0x");
+
   strcat(request,searchkey_encoded);
 
   if(search_type!=KS_SEARCH_SUBSTR)