summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2007-03-10 05:07:20 +0100
committerDavid Shaw <dshaw@jabberwocky.com>2007-03-10 05:07:20 +0100
commitc1239f5a4402cdcc0a641fa63a16454a160be8ac (patch)
treea75a2ea1387a7d1412ff15301e731cc48b830a64
parentFrom STABLE-BRANCH-1-4 (diff)
downloadgnupg2-c1239f5a4402cdcc0a641fa63a16454a160be8ac.tar.xz
gnupg2-c1239f5a4402cdcc0a641fa63a16454a160be8ac.zip
From STABLE-BRANCH-1-4
* gpgkeys_ldap.c (send_key): Missing a free(). * curl-shim.c (curl_easy_perform): Some debugging items that may be handy.
-rw-r--r--keyserver/ChangeLog9
-rw-r--r--keyserver/curl-shim.c9
-rw-r--r--keyserver/gpgkeys_ldap.c1
3 files changed, 18 insertions, 1 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 3511889c5..e50826eef 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-09 David Shaw <dshaw@jabberwocky.com>
+
+ From STABLE-BRANCH-1-4
+
+ * gpgkeys_ldap.c (send_key): Missing a free().
+
+ * curl-shim.c (curl_easy_perform): Some debugging items that may
+ be handy.
+
2006-12-03 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index 406e26ee0..6c35c51d4 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -178,7 +178,14 @@ curl_easy_perform(CURL *curl)
proxy=getenv(HTTP_PROXY_ENV);
if(curl->flags.verbose)
- fprintf(curl->errors,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null");
+ {
+ fprintf(curl->errors,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null");
+ fprintf(curl->errors,"* HTTP URL is \"%s\"\n",curl->url);
+ fprintf(curl->errors,"* HTTP auth is \"%s\"\n",
+ curl->auth?curl->auth:"null");
+ fprintf(curl->errors,"* HTTP method is %s\n",
+ curl->flags.post?"POST":"GET");
+ }
if(curl->flags.post)
{
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index df4279ff7..c409c3435 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -782,6 +782,7 @@ send_key(int *eof)
free(modlist);
free(addlist);
free(dn);
+ free(key);
if(ret!=0 && begin)
fprintf(output,"KEY %s FAILED %d\n",keyid,ret);