1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-20 01:02:44 +02:00

* keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as well.

From 1.4.
This commit is contained in:
David Shaw 2009-05-11 03:56:34 +00:00
parent a0627f5a22
commit b613817269
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2009-05-10 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as
well. From 1.4.
2009-05-06 Werner Koch <wk@g10code.com> 2009-05-06 Werner Koch <wk@g10code.com>
* getkey.c (finish_lookup): Remove dead code. * getkey.c (finish_lookup): Remove dead code.

View File

@ -1,6 +1,6 @@
/* keyserver.c - generic keyserver code /* keyserver.c - generic keyserver code
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
* 2007, 2008 Free Software Foundation, Inc. * 2009 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -941,6 +941,8 @@ keyserver_typemap(const char *type)
{ {
if(strcmp(type,"ldaps")==0) if(strcmp(type,"ldaps")==0)
return "ldap"; return "ldap";
else if(strcmp(type,"hkps")==0)
return "hkp";
else else
return type; return type;
} }