[svn] GnuPG - r4009 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-02-21 06:20:08 +0100 (Tue, 21 Feb 2006)
New Revision: 4009

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keyserver.c
Log:
* keyserver.c (parse_keyserver_uri): Include the scheme in the uri
even when we've assumed "hkp" when there was no scheme.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-02-19 22:09:10 UTC (rev 4008)
+++ trunk/g10/ChangeLog	2006-02-21 05:20:08 UTC (rev 4009)
@@ -1,3 +1,8 @@
+2006-02-20  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyserver.c (parse_keyserver_uri): Include the scheme in the uri
+	even when we've assumed "hkp" when there was no scheme.
+
 2006-02-14  Werner Koch  <wk at gnupg.org>
 
 	* verify.c (verify_signatures): Print warning also for NO_DATA.

Modified: trunk/g10/keyserver.c
===================================================================
--- trunk/g10/keyserver.c	2006-02-19 22:09:10 UTC (rev 4008)
+++ trunk/g10/keyserver.c	2006-02-21 05:20:08 UTC (rev 4009)
@@ -215,8 +215,6 @@
 
   keyserver=xmalloc_clear(sizeof(struct keyserver_spec));
 
-  keyserver->uri=xstrdup(uri);
-
   /* Get the scheme */
 
   for(idx=uri,count=0;*idx && *idx!=':';idx++)
@@ -247,11 +245,18 @@
       /* Assume HKP if there is no scheme */
       assume_hkp=1;
       keyserver->scheme=xstrdup("hkp");
+
+      keyserver->uri=xmalloc(strlen(keyserver->scheme)+3+strlen(uri)+1);
+      strcpy(keyserver->uri,keyserver->scheme);
+      strcat(keyserver->uri,"://");
+      strcat(keyserver->uri,uri);
     }
   else
     {
       int i;
 
+      keyserver->uri=xstrdup(uri);
+
       keyserver->scheme=xmalloc(count+1);
 
       /* Force to lowercase */