From e532a4e86fb2f1d457b7cca6e68e8e44b5c1df72 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 3 Feb 2009 19:49:17 +0000 Subject: [PATCH] * keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as well. --- g10/ChangeLog | 5 +++++ g10/keyserver.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 55fe2f932..c3f9deb19 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2009-02-03 David Shaw + + * keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as + well. + 2008-12-21 David Shaw * gpg.c (main): Properly handle UTF8 usernames with --sign-key and diff --git a/g10/keyserver.c b/g10/keyserver.c index c50f5961f..5d808f35a 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 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 @@ keyserver_typemap(const char *type) { if(strcmp(type,"ldaps")==0) return "ldap"; + else if(strcmp(type,"hkps")==0) + return "hkp"; else return type; }