From b613817269eb1fbd9bcbd402ae92bfec1458d9ec Mon Sep 17 00:00:00 2001 From: David Shaw Date: Mon, 11 May 2009 03:56:34 +0000 Subject: * keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as well. From 1.4. --- g10/ChangeLog | 5 +++++ g10/keyserver.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 9f4119889..c3cd0e860 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2009-05-10 David Shaw + + * keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as + well. From 1.4. + 2009-05-06 Werner Koch * getkey.c (finish_lookup): Remove dead code. 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; } -- cgit v1.2.3