aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyserver.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2009-05-11 03:56:34 +0000
committerDavid Shaw <[email protected]>2009-05-11 03:56:34 +0000
commitb613817269eb1fbd9bcbd402ae92bfec1458d9ec (patch)
treefd365075e5e430147ab5e8fdaf922c1ed831c379 /g10/keyserver.c
parent* gpgkeys_hkp.c (send_key, get_key, get_name, search_key, main): Add (diff)
downloadgnupg-b613817269eb1fbd9bcbd402ae92bfec1458d9ec.tar.gz
gnupg-b613817269eb1fbd9bcbd402ae92bfec1458d9ec.zip
* keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as well.
From 1.4.
Diffstat (limited to '')
-rw-r--r--g10/keyserver.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c
index f63ff8b83..249a62f95 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -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 @@ keyserver_typemap(const char *type)
{
if(strcmp(type,"ldaps")==0)
return "ldap";
+ else if(strcmp(type,"hkps")==0)
+ return "hkp";
else
return type;
}