diff options
| author | David Shaw <[email protected]> | 2005-02-05 15:04:59 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-02-05 15:04:59 +0000 |
| commit | 203e4835f64332732bfd8b427bb6f7bf79e81bbf (patch) | |
| tree | 379169f0a1f0b4838bee7fb8728a88e82e696526 | |
| parent | * getkey.c (merge_selfsigs_subkey): Merged away definition from the (diff) | |
| download | gnupg-203e4835f64332732bfd8b427bb6f7bf79e81bbf.tar.gz gnupg-203e4835f64332732bfd8b427bb6f7bf79e81bbf.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | keyserver/ChangeLog | 8 | ||||
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 5 | ||||
| -rw-r--r-- | keyserver/gpgkeys_finger.c | 2 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 6b4aebe4d..4149e71f9 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,11 @@ +2005-02-05 David Shaw <[email protected]> + + * 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 <[email protected]> * gpgkeys_hkp.c (get_key), gpgkeys_http.c (get_key): Fix missing diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index 7d8fcd175..71ee97260 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -470,8 +470,6 @@ main(int argc,char *argv[]) ret=get_key(thekey); - curl_easy_cleanup(curl); - fail: free(thekey); @@ -482,6 +480,9 @@ main(int argc,char *argv[]) if(output!=stdout) fclose(output); + if(curl) + curl_easy_cleanup(curl); + curl_global_cleanup(); return ret; diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c index c01bb1a22..0ced124c1 100644 --- a/keyserver/gpgkeys_finger.c +++ b/keyserver/gpgkeys_finger.c @@ -372,7 +372,7 @@ main(int argc,char *argv[]) /* 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")) diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index 9a3f87d53..6cdefc6bc 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -763,7 +763,7 @@ main(int argc,char *argv[]) /* 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")) |