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

[Kamil Dudka]

commit 83e6d4cfd57b8c74b7177886b9bcca5f2d57a090
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

 0021-curl-7.29.0-ec5fde24.patch |   31 +++++++++++++++++++++++++++++++
 curl.spec                       |    5 +++++
 2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/0021-curl-7.29.0-ec5fde24.patch b/0021-curl-7.29.0-ec5fde24.patch
new file mode 100644
index 0000000..51341ba
--- /dev/null
+++ b/0021-curl-7.29.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
+@@ -743,7 +743,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn,
+           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, (bool)(httpcode == 407), start);
+           if(neg == 0) {
+             DEBUGASSERT(!data->req.newurl);
+-- 
+1.8.3.1
+
diff --git a/curl.spec b/curl.spec
index e3277c1..07baf99 100644
--- a/curl.spec
+++ b/curl.spec
@@ -64,6 +64,9 @@ Patch19: 0019-curl-7.29.0-8868a226.patch
 # extend URL parser to support IPv6 zone identifiers (#680996)
 Patch20: 0020-curl-7.29.0-9317eced.patch
 
+# auth failure on duplicated 'WWW-Authenticate: Negotiate' header (#1093348)
+Patch21: 0021-curl-7.29.0-ec5fde24.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.29.0-multilib.patch
 
@@ -191,6 +194,7 @@ documentation of the library, too.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -313,6 +317,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sat May 10 2014 Kamil Dudka <kdudka at redhat.com> 7.29.0-19
 - extend URL parser to support IPv6 zone identifiers (#680996)
+- auth failure on duplicated 'WWW-Authenticate: Negotiate' header (#1093348)
 
 * Fri Apr 25 2014 Kamil Dudka <kdudka at redhat.com> 7.29.0-18
 - nss: implement non-blocking SSL handshake