[curl] amend the last commit

Kamil Dudka kdudka at fedoraproject.org
Wed Aug 3 16:49:13 UTC 2011


commit 4894bf2d1a1b695685e3cb216eab8286bc3932f7
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Wed Aug 3 18:41:20 2011 +0200

    amend the last commit
    
    Last time I committed an outdated version of the upstream patch.

 0001-curl-7.21.7-a7864c4.patch |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/0001-curl-7.21.7-a7864c4.patch b/0001-curl-7.21.7-a7864c4.patch
index 31fd614..477f1e1 100644
--- a/0001-curl-7.21.7-a7864c4.patch
+++ b/0001-curl-7.21.7-a7864c4.patch
@@ -416,21 +416,38 @@ Subject: [PATCH 2/2] curl_gssapi: add a missing include of sendf.h
 
 Reported by: Paul Howarth
 ---
- lib/curl_gssapi.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ lib/curl_gssapi.c |    3 ++-
+ lib/curl_gssapi.h |    2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/lib/curl_gssapi.c b/lib/curl_gssapi.c
 index e55c9cc..d1b1715 100644
 --- a/lib/curl_gssapi.c
 +++ b/lib/curl_gssapi.c
-@@ -25,6 +25,7 @@
+@@ -25,8 +25,9 @@
  #ifdef HAVE_GSSAPI
  
  #include "curl_gssapi.h"
 +#include "sendf.h"
  
- void Curl_gss_req_flags(OM_uint32 *req_flags, const struct SessionHandle *data)
+-void Curl_gss_req_flags(OM_uint32 *req_flags, const struct SessionHandle *data)
++void Curl_gss_req_flags(OM_uint32 *req_flags, struct SessionHandle *data)
  {
+   if(data->set.gssapi_delegation & CURLGSSAPI_DELEGATION_POLICY_FLAG) {
+ #ifdef GSS_C_DELEG_POLICY_FLAG
+diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h
+index 02aa527..c8ffefc 100644
+--- a/lib/curl_gssapi.h
++++ b/lib/curl_gssapi.h
+@@ -39,7 +39,7 @@
+ #  include <gssapi.h>
+ #endif
+ 
+-void Curl_gss_req_flags(OM_uint32 *req_flags, const struct SessionHandle *data);
++void Curl_gss_req_flags(OM_uint32 *req_flags, struct SessionHandle *data);
+ 
+ #endif /* HAVE_GSSAPI */
+ 
 -- 
 1.7.4.4
 


More information about the scm-commits mailing list