gnupg/keyserver (4 files)

[cvs user dshaw]

    Date: Saturday, February 5, 2005 @ 16:04:59
  Author: dshaw
    Path: /cvs/gnupg/gnupg/keyserver

Modified: ChangeLog gpgkeys_curl.c gpgkeys_finger.c gpgkeys_hkp.c

* gpgkeys_finger.c (main), gpgkeys_hkp.c (main): Fix --version output.

* gpgkeys_curl.c (main): Make sure the curl handle is cleaned up on
failure.


------------------+
 ChangeLog        |    8 ++++++++
 gpgkeys_curl.c   |    5 +++--
 gpgkeys_finger.c |    2 +-
 gpgkeys_hkp.c    |    2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)


Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.110 gnupg/keyserver/ChangeLog:1.111
--- gnupg/keyserver/ChangeLog:1.110	Tue Feb  1 21:57:08 2005
+++ gnupg/keyserver/ChangeLog	Sat Feb  5 16:04:59 2005
@@ -1,3 +1,11 @@
+2005-02-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_finger.c (main), gpgkeys_hkp.c (main): Fix --version
+	output.
+
+	* gpgkeys_curl.c (main): Make sure the curl handle is cleaned up
+	on failure.
+
 2005-02-01  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_hkp.c (get_key), gpgkeys_http.c (get_key): Fix missing
Index: gnupg/keyserver/gpgkeys_curl.c
diff -u gnupg/keyserver/gpgkeys_curl.c:1.11 gnupg/keyserver/gpgkeys_curl.c:1.12
--- gnupg/keyserver/gpgkeys_curl.c:1.11	Mon Jan 24 19:23:56 2005
+++ gnupg/keyserver/gpgkeys_curl.c	Sat Feb  5 16:04:59 2005
@@ -470,8 +470,6 @@
 
   ret=get_key(thekey);
 
-  curl_easy_cleanup(curl);
-
  fail:
 
   free(thekey);
@@ -482,6 +480,9 @@
   if(output!=stdout)
     fclose(output);
 
+  if(curl)
+    curl_easy_cleanup(curl);
+
   curl_global_cleanup();
 
   return ret;
Index: gnupg/keyserver/gpgkeys_finger.c
diff -u gnupg/keyserver/gpgkeys_finger.c:1.12 gnupg/keyserver/gpgkeys_finger.c:1.13
--- gnupg/keyserver/gpgkeys_finger.c:1.12	Fri Jan 14 00:37:26 2005
+++ gnupg/keyserver/gpgkeys_finger.c	Sat Feb  5 16:04:59 2005
@@ -372,7 +372,7 @@
   /* Kludge to implement standard GNU options.  */
   if (argc > 1 && !strcmp (argv[1], "--version"))
     {
-      fputs ("gpgkeys_ldap (GnuPG) " VERSION"\n", stdout);
+      fputs ("gpgkeys_finger (GnuPG) " VERSION"\n", stdout);
       return 0;
     }
   else if (argc > 1 && !strcmp (argv[1], "--help"))
Index: gnupg/keyserver/gpgkeys_hkp.c
diff -u gnupg/keyserver/gpgkeys_hkp.c:1.48 gnupg/keyserver/gpgkeys_hkp.c:1.49
--- gnupg/keyserver/gpgkeys_hkp.c:1.48	Tue Feb  1 21:57:08 2005
+++ gnupg/keyserver/gpgkeys_hkp.c	Sat Feb  5 16:04:59 2005
@@ -763,7 +763,7 @@
   /* Kludge to implement standard GNU options.  */
   if (argc > 1 && !strcmp (argv[1], "--version"))
     {
-      fputs ("gpgkeys_ldap (GnuPG) " VERSION"\n", stdout);
+      fputs ("gpgkeys_hkp (GnuPG) " VERSION"\n", stdout);
       return 0;
     }
   else if (argc > 1 && !strcmp (argv[1], "--help"))