[svn] GnuPG - r4925 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2009-02-03 20:49:17 +0100 (Tue, 03 Feb 2009)
New Revision: 4925

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/keyserver.c
Log:
* keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as well.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-02-03 19:40:28 UTC (rev 4924)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-02-03 19:49:17 UTC (rev 4925)
@@ -1,3 +1,8 @@
+2009-02-03  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as
+	well.
+
 2008-12-21  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpg.c (main): Properly handle UTF8 usernames with --sign-key and

Modified: branches/STABLE-BRANCH-1-4/g10/keyserver.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keyserver.c	2009-02-03 19:40:28 UTC (rev 4924)
+++ branches/STABLE-BRANCH-1-4/g10/keyserver.c	2009-02-03 19:49:17 UTC (rev 4925)
@@ -1,6 +1,6 @@
 /* keyserver.c - generic keyserver code
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
- *               2007 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.
  *
@@ -927,6 +927,8 @@
 {
   if(strcmp(type,"ldaps")==0)
     return "ldap";
+  else if(strcmp(type,"hkps")==0)
+    return "hkp";
   else
     return type;
 }