aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-08-04 03:59:16 +0000
committerDavid Shaw <[email protected]>2005-08-04 03:59:16 +0000
commit1990aacce09a91da739f12cfabe6009c0561b130 (patch)
treea6bcae014413ef3006c5ee783e916104784722ee
parentRemoved silly old file (diff)
downloadgnupg-1990aacce09a91da739f12cfabe6009c0561b130.tar.gz
gnupg-1990aacce09a91da739f12cfabe6009c0561b130.zip
* gpgkeys_hkp.c (main), gpgkeys_curl.c (main), curl-shim.h: Show
version of curl (or curl-shim) when debug is set.
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/curl-shim.h1
-rw-r--r--keyserver/gpgkeys_curl.c1
-rw-r--r--keyserver/gpgkeys_hkp.c1
4 files changed, 8 insertions, 0 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index ed86e2296..ce55bd6e8 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-03 David Shaw <[email protected]>
+
+ * gpgkeys_hkp.c (main), gpgkeys_curl.c (main), curl-shim.h: Show
+ version of curl (or curl-shim) when debug is set.
+
2005-07-20 David Shaw <[email protected]>
* gpgkeys_curl.c (get_key, main): Don't try and be smart about
diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h
index c78c12960..f8a111466 100644
--- a/keyserver/curl-shim.h
+++ b/keyserver/curl-shim.h
@@ -85,5 +85,6 @@ CURLcode curl_easy_perform(CURL *curl);
void curl_easy_cleanup(CURL *curl);
char *curl_escape(char *str,int len);
void curl_free(char *ptr);
+#define curl_version() "GnuPG curl-shim "VERSION
#endif /* !_CURL_SHIM_H_ */
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c
index c3dce6abd..c411b231f 100644
--- a/keyserver/gpgkeys_curl.c
+++ b/keyserver/gpgkeys_curl.c
@@ -260,6 +260,7 @@ main(int argc,char *argv[])
if(opt->debug)
{
+ fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
curl_easy_setopt(curl,CURLOPT_STDERR,console);
curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
}
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 1904cdefc..cd0773fde 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -533,6 +533,7 @@ main(int argc,char *argv[])
if(opt->debug)
{
+ fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
curl_easy_setopt(curl,CURLOPT_STDERR,console);
curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
}