[curl] Resolves: #1093348 - auth failure on duplicated 'WWW-Authenticate: Negotiate' header

[Kamil Dudka]

commit 8b3cb24b84deaf86a4958df24e37526fffcad839
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Fri May 9 23:43:40 2014 +0200

    Resolves: #1093348 - auth failure on duplicated 'WWW-Authenticate: Negotiate' header

 0004-curl-7.36.0-ec5fde24.patch |   31 +++++++++++++++++++++++++++++++
 curl.spec                       |    9 ++++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/0004-curl-7.36.0-ec5fde24.patch b/0004-curl-7.36.0-ec5fde24.patch
new file mode 100644
index 0000000..dabe230
--- /dev/null
+++ b/0004-curl-7.36.0-ec5fde24.patch
@@ -0,0 +1,31 @@
+From c6cecc7bd90e0e89308e8e5c6c590861c00db6f3 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at redhat.com>
+Date: Mon, 5 May 2014 14:49:30 +0200
+Subject: [PATCH] http: avoid auth failure on a duplicated header
+
+... 'WWW-Authenticate: Negotiate' received from server
+
+Reported by: David Woodhouse
+Bug: https://bugzilla.redhat.com/1093348
+
+[upstream commit ec5fde24de5ddd1910730f0cbac5e77820b26eb9]
+---
+ lib/http.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/http.c b/lib/http.c
+index 3f8a4c0..90b37d8 100644
+--- a/lib/http.c
++++ b/lib/http.c
+@@ -752,7 +752,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy,
+           infof(data, "Authentication problem. Ignoring this.\n");
+           data->state.authproblem = TRUE;
+         }
+-        else {
++        else if(data->state.negotiate.state == GSS_AUTHNONE) {
+           neg = Curl_input_negotiate(conn, proxy, auth);
+           if(neg == 0) {
+             DEBUGASSERT(!data->req.newurl);
+-- 
+1.8.3.1
+
diff --git a/curl.spec b/curl.spec
index 08b5dc1..18a2582 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.36.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -16,6 +16,9 @@ Patch2: 0002-curl-7.36.0-9317eced.patch
 # nss: implement non-blocking SSL handshake
 Patch3: 0003-curl-7.36.0-8868a226.patch
 
+# auth failure on duplicated 'WWW-Authenticate: Negotiate' header (#1093348)
+Patch4: 0004-curl-7.36.0-ec5fde24.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -131,6 +134,7 @@ documentation of the library, too.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -252,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri May 09 2014 Kamil Dudka <kdudka at redhat.com> 7.36.0-4
+- auth failure on duplicated 'WWW-Authenticate: Negotiate' header (#1093348)
+
 * Fri Apr 25 2014 Kamil Dudka <kdudka at redhat.com> 7.36.0-3
 - nss: implement non-blocking SSL handshake