diff options
| author | David Shaw <[email protected]> | 2008-04-14 19:41:40 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2008-04-14 19:41:40 +0000 |
| commit | c15eb48603a5a9a596068873a673f3b1ea98f202 (patch) | |
| tree | 1fa2655c0e44ae8c6fa9b48cef37324d1f9ab0e6 /keyserver/gpgkeys_curl.c | |
| parent | Enhanced --auto-key-locate. (diff) | |
| download | gnupg-c15eb48603a5a9a596068873a673f3b1ea98f202.tar.gz gnupg-c15eb48603a5a9a596068873a673f3b1ea98f202.zip | |
* 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'.
Diffstat (limited to 'keyserver/gpgkeys_curl.c')
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index f14b4c9a7..d66bee033 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. * @@ -285,7 +285,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); } @@ -297,10 +297,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) |