[svn] GnuPG - r4825 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2008-09-04 18:54:58 +0200 (Thu, 04 Sep 2008)
New Revision: 4825

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keyserver.c
Log:
* keyserver.c (keyserver_import_cert): Allow keyserver URLs in
  addition to full URLs in CERT records.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2008-09-04 16:47:34 UTC (rev 4824)
+++ trunk/g10/ChangeLog	2008-09-04 16:54:58 UTC (rev 4825)
@@ -1,3 +1,8 @@
+2008-09-04  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyserver.c (keyserver_import_cert): Allow keyserver URLs in
+	addition to full URLs in CERT records.
+
 2008-08-11  Werner Koch  <wk at g10code.com>
 
 	* keygen.c (ask_expire_interval): Check for time overflow of an

Modified: trunk/g10/keyserver.c
===================================================================
--- trunk/g10/keyserver.c	2008-09-04 16:47:34 UTC (rev 4824)
+++ trunk/g10/keyserver.c	2008-09-04 16:54:58 UTC (rev 4825)
@@ -2041,13 +2041,7 @@
 	  spec=parse_keyserver_uri(url,1,NULL,0);
 	  if(spec)
 	    {
-	      strlist_t list=NULL;
-
-	      add_to_strlist(&list,url);
-
-	      rc=keyserver_fetch(list);
-
-	      free_strlist(list);
+	      rc=keyserver_import_fprint(*fpr,*fpr_len,spec);
 	      free_keyserver_spec(spec);
 	    }
 	}