[svn] GnuPG - r4742 - branches/STABLE-BRANCH-1-4/keyserver

[svn author dshaw]

Author: dshaw
Date: 2008-04-14 18:08:00 +0200 (Mon, 14 Apr 2008)
New Revision: 4742

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/curl-shim.c
Log:
* curl-shim.c (curl_easy_setopt): Minor tweak to match the real curl
better - libcurl uses 'long', not 'unsigned int'.


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2008-04-13 01:56:01 UTC (rev 4741)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2008-04-14 16:08:00 UTC (rev 4742)
@@ -1,3 +1,8 @@
+2008-04-14  David Shaw  <dshaw at jabberwocky.com>
+
+	* 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  <wk at g10code.com>
 
 	* gpgkeys_ldap.c (build_attrs): Take care of char defaulting to

Modified: branches/STABLE-BRANCH-1-4/keyserver/curl-shim.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/curl-shim.c	2008-04-13 01:56:01 UTC (rev 4741)
+++ branches/STABLE-BRANCH-1-4/keyserver/curl-shim.c	2008-04-14 16:08:00 UTC (rev 4742)
@@ -129,16 +129,16 @@
       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 *);