[svn] GnuPG - r5001 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2009-05-11 05:56:34 +0200 (Mon, 11 May 2009)
New Revision: 5001

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keyserver.c
Log:
* keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as well.
>From 1.4.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2009-05-11 03:52:34 UTC (rev 5000)
+++ trunk/g10/ChangeLog	2009-05-11 03:56:34 UTC (rev 5001)
@@ -1,3 +1,8 @@
+2009-05-10  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as
+	well.  From 1.4.
+
 2009-05-06  Werner Koch  <wk at g10code.com>
 
 	* getkey.c (finish_lookup): Remove dead code.

Modified: trunk/g10/keyserver.c
===================================================================
--- trunk/g10/keyserver.c	2009-05-11 03:52:34 UTC (rev 5000)
+++ trunk/g10/keyserver.c	2009-05-11 03:56:34 UTC (rev 5001)
@@ -1,6 +1,6 @@
 /* keyserver.c - generic keyserver code
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
- *               2007, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ *               2009 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -941,6 +941,8 @@
 {
   if(strcmp(type,"ldaps")==0)
     return "ldap";
+  else if(strcmp(type,"hkps")==0)
+    return "hkp";
   else
     return type;
 }