diff options
| -rw-r--r-- | keyserver/ChangeLog | 3 | ||||
| -rw-r--r-- | keyserver/curl-shim.c | 2 | ||||
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 8 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 10 |
4 files changed, 13 insertions, 10 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 8003b6035..05d18c8d6 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,8 @@ 2008-04-14 David Shaw <[email protected]> + * gpgkeys_curl.c (main), gpgkeys_hkp.c (main): Make sure all + libcurl number options are passed as long. + * curl-shim.c (curl_easy_setopt): Minor tweak to match the real curl better - libcurl uses 'long', not 'unsigned int'. diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c index 1b97e040f..bf365cf97 100644 --- a/keyserver/curl-shim.c +++ b/keyserver/curl-shim.c @@ -1,7 +1,7 @@ /* curl-shim.c - Implement a small subset of the curl API in terms of * the iobuf HTTP API * - * 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. * diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index 6adf6746c..912536faf 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -1,5 +1,5 @@ /* gpgkeys_curl.c - fetch a key via libcurl - * Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -286,7 +286,7 @@ main(int argc,char *argv[]) if(follow_redirects) { - curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1); + curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1L); if(follow_redirects>0) curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects); } @@ -298,10 +298,10 @@ main(int argc,char *argv[]) { fprintf(console,"gpgkeys: curl version = %s\n",curl_version()); curl_easy_setopt(curl,CURLOPT_STDERR,console); - curl_easy_setopt(curl,CURLOPT_VERBOSE,1); + curl_easy_setopt(curl,CURLOPT_VERBOSE,1L); } - curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert); + curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert); curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file); if(proxy) diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index ed9610de4..1d0853dbb 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -1,6 +1,6 @@ /* gpgkeys_hkp.c - talk to an HKP keyserver - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -202,9 +202,9 @@ send_key(int *eof) fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request); curl_easy_setopt(curl,CURLOPT_URL,request); - curl_easy_setopt(curl,CURLOPT_POST,1); + curl_easy_setopt(curl,CURLOPT_POST,1L); curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key); - curl_easy_setopt(curl,CURLOPT_FAILONERROR,1); + curl_easy_setopt(curl,CURLOPT_FAILONERROR,1L); res=curl_easy_perform(curl); if(res!=0) @@ -661,7 +661,7 @@ main(int argc,char *argv[]) { fprintf(console,"gpgkeys: curl version = %s\n",curl_version()); curl_easy_setopt(curl,CURLOPT_STDERR,console); - curl_easy_setopt(curl,CURLOPT_VERBOSE,1); + curl_easy_setopt(curl,CURLOPT_VERBOSE,1L); } if(proxy) |