security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-25 22:19:59 +01:00
Code Activity

* curl-shim.h, gpgkeys_curl.c, gpgkeys_hkp.c (main): Always show curl

Browse Source 
version (even for curl-shim).
This commit is contained in:
David Shaw 2008-11-18 18:43:13 +00:00
parent 5452f53c5c
commit b3ac8341d9
4 changed files with 8 additions and 9 deletions

5
keyserver/ChangeLog

@ -1,3 +1,8 @@
2008-11-18 David Shaw <dshaw@jabberwocky.com>
* curl-shim.h, gpgkeys_curl.c, gpgkeys_hkp.c (main): Always show
curl version (even for curl-shim).
2008-11-18 Werner Koch <wk@g10code.com>
* gpgkeys_curl.c (main): Print curl version according to GNU standards.

4
keyserver/curl-shim.h

@ -1,5 +1,5 @@
/* curl-shim.h
* Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
* Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
@ -83,8 +83,6 @@ typedef struct
#define CURL_GLOBAL_DEFAULT 0
#define CURLVERSION_NOW 0
#define curl_is_gnupg_curl_shim 1
CURLcode curl_global_init(long flags);
void curl_global_cleanup(void);
CURL *curl_easy_init(void);

4
keyserver/gpgkeys_curl.c

@ -125,9 +125,7 @@ main(int argc,char *argv[])
if (argc > 1 && !strcmp (argv[1], "--version"))
{
printf ("gpgkeys_curl (GnuPG) %s\n", VERSION);
#ifndef curl_is_gnupg_curl_shim
printf ("libcurl %s\n", curl_version());
#endif /*curl_is_gnupg_curl_shim*/
printf ("Uses: %s\n", curl_version());
return 0;
}
else if (argc > 1 && !strcmp (argv[1], "--help"))

4
keyserver/gpgkeys_hkp.c

@ -518,9 +518,7 @@ main(int argc,char *argv[])
if (argc > 1 && !strcmp (argv[1], "--version"))
{
printf ("gpgkeys_hkp (GnuPG) %s\n", VERSION);
#ifndef curl_is_gnupg_curl_shim
printf ("libcurl %s\n", curl_version());
#endif /*curl_is_gnupg_curl_shim*/
printf ("Uses: %s\n", curl_version());
return 0;
}
else if (argc > 1 && !strcmp (argv[1], "--help"))