aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2008-04-14 16:08:00 +0000
committerDavid Shaw <[email protected]>2008-04-14 16:08:00 +0000
commitb9cbb0aa0b423f1663f0096fa9f54fcee88d5aa6 (patch)
treebb22a5c7baab4f5ac15a2a3907d2238acba91425
parent* getkey.c (merge_selfsigs_subkey): If there are multiple 0x19 (diff)
downloadgnupg-b9cbb0aa0b423f1663f0096fa9f54fcee88d5aa6.tar.gz
gnupg-b9cbb0aa0b423f1663f0096fa9f54fcee88d5aa6.zip
* curl-shim.c (curl_easy_setopt): Minor tweak to match the real curl
better - libcurl uses 'long', not 'unsigned int'.
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/curl-shim.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 3d4ecc143..8003b6035 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-14 David Shaw <[email protected]>
+
+ * curl-shim.c (curl_easy_setopt): Minor tweak to match the real
+ curl better - libcurl uses 'long', not 'unsigned int'.
+
2008-03-25 Werner Koch <[email protected]>
* gpgkeys_ldap.c (build_attrs): Take care of char defaulting to
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index 3e058c239..1b97e040f 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -129,16 +129,16 @@ curl_easy_setopt(CURL *curl,CURLoption option,...)
curl->proxy=va_arg(ap,char *);
break;
case CURLOPT_POST:
- curl->flags.post=va_arg(ap,unsigned int);
+ curl->flags.post=va_arg(ap,long)?1:0;
break;
case CURLOPT_POSTFIELDS:
curl->postfields=va_arg(ap,char *);
break;
case CURLOPT_FAILONERROR:
- curl->flags.failonerror=va_arg(ap,unsigned int);
+ curl->flags.failonerror=va_arg(ap,long)?1:0;
break;
case CURLOPT_VERBOSE:
- curl->flags.verbose=va_arg(ap,unsigned int);
+ curl->flags.verbose=va_arg(ap,long)?1:0;
break;
case CURLOPT_STDERR:
curl->errors=va_arg(ap,FILE *);