aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--keyserver/ChangeLog7
-rw-r--r--keyserver/curl-shim.c9
-rw-r--r--keyserver/gpgkeys_ldap.c1
3 files changed, 16 insertions, 1 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 7d2cb6ce7..0c009e2b7 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-10 David Shaw <[email protected]>
+
+ * gpgkeys_ldap.c (send_key): Missing a free().
+
+ * curl-shim.c (curl_easy_perform): Some debugging items that may
+ be handy.
+
2007-01-16 David Shaw <[email protected]>
* curl-shim.h, curl-shim.c, gpgkeys_hkp.c: Rename curl_escape() to
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index 3d9d109ba..d8b3da806 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -173,7 +173,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 1cc27f452..1f74d7b35 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);