[svn] GnuPG - r4457 - trunk/keyserver

[svn author dshaw]

Author: dshaw
Date: 2007-03-10 05:07:20 +0100 (Sat, 10 Mar 2007)
New Revision: 4457

Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/curl-shim.c
   trunk/keyserver/gpgkeys_ldap.c
Log:
>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.


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2007-03-10 02:05:54 UTC (rev 4456)
+++ trunk/keyserver/ChangeLog	2007-03-10 04:07:20 UTC (rev 4457)
@@ -1,3 +1,12 @@
+2007-03-09  David Shaw  <dshaw at 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 at jabberwocky.com>
 
 	* gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be

Modified: trunk/keyserver/curl-shim.c
===================================================================
--- trunk/keyserver/curl-shim.c	2007-03-10 02:05:54 UTC (rev 4456)
+++ trunk/keyserver/curl-shim.c	2007-03-10 04:07:20 UTC (rev 4457)
@@ -178,7 +178,14 @@
     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)
     {

Modified: trunk/keyserver/gpgkeys_ldap.c
===================================================================
--- trunk/keyserver/gpgkeys_ldap.c	2007-03-10 02:05:54 UTC (rev 4456)
+++ trunk/keyserver/gpgkeys_ldap.c	2007-03-10 04:07:20 UTC (rev 4457)
@@ -782,6 +782,7 @@
   free(modlist);
   free(addlist);
   free(dn);
+  free(key);
 
   if(ret!=0 && begin)
     fprintf(output,"KEY %s FAILED %d\n",keyid,ret);