summaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2006-11-06 05:03:44 +0100
committerDavid Shaw <dshaw@jabberwocky.com>2006-11-06 05:03:44 +0100
commit8add46fcee0472cec8bc0de2183c2bc801fc70b4 (patch)
treeb707517c7e70c6b17889d4fc1c90116537ae4869 /keyserver
parent* gpg.texi: Reference to --s2k-count in --s2k-mode. (diff)
downloadgnupg2-8add46fcee0472cec8bc0de2183c2bc801fc70b4.tar.xz
gnupg2-8add46fcee0472cec8bc0de2183c2bc801fc70b4.zip
* gpgkeys_hkp.c (curl_mrindex_writer): Revert previous change.
Key-not-found still has a HTML response.
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/gpgkeys_hkp.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 88b133c74..bd62698c2 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-05 David Shaw <dshaw@jabberwocky.com>
+
+ * gpgkeys_hkp.c (curl_mrindex_writer): Revert previous change.
+ Key-not-found still has a HTML response.
+
2006-10-24 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpg2keys_ldap_CPPFLAGS): Rename second instance to ...
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 4b6dc8157..19c96bae6 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -1,5 +1,6 @@
/* gpgkeys_hkp.c - talk to an HKP keyserver
- * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005
+ * 2006 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -68,10 +69,7 @@ curl_mrindex_writer(const void *ptr,size_t size,size_t nmemb,void *stream)
with it on this side of the pipe. */
const char *buf=ptr;
if(buf[0]=='<')
- {
- fprintf(console,"gpgkeys: unsupported response from keyserver\n");
- swallow=1;
- }
+ swallow=1;
checked=1;
}