r41302 - in /desktop/wheezy/libsoup2.4/debian: changelog control patches/01_ntlm_domain.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Apr 11 14:10:06 2014
New Revision: 41302

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41302
Log:
01_ntlm_domain.patch: patch from upstream git. Fix some cases of 
NTLM authentication on W2013 servers.

Added:
    desktop/wheezy/libsoup2.4/debian/patches/01_ntlm_domain.patch
Modified:
    desktop/wheezy/libsoup2.4/debian/changelog
    desktop/wheezy/libsoup2.4/debian/control
    desktop/wheezy/libsoup2.4/debian/patches/series

Modified: desktop/wheezy/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/libsoup2.4/debian/changelog?rev=41302&op=diff
==============================================================================
--- desktop/wheezy/libsoup2.4/debian/changelog	[utf-8] (original)
+++ desktop/wheezy/libsoup2.4/debian/changelog	[utf-8] Fri Apr 11 14:10:06 2014
@@ -1,3 +1,10 @@
+libsoup2.4 (2.38.1-3) stable; urgency=low
+
+  * 01_ntlm_domain.patch: patch from upstream git. Fix some cases of 
+    NTLM authentication on W2013 servers.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 11 Apr 2014 15:56:32 +0200
+
 libsoup2.4 (2.38.1-2) unstable; urgency=low
 
   * Make test suite failures non-fatal so we don't block testing migration due

Modified: desktop/wheezy/libsoup2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/libsoup2.4/debian/control?rev=41302&op=diff
==============================================================================
--- desktop/wheezy/libsoup2.4/debian/control	[utf-8] (original)
+++ desktop/wheezy/libsoup2.4/debian/control	[utf-8] Fri Apr 11 14:10:06 2014
@@ -7,7 +7,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Gustavo Noronha Silva <kov at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.93~),
                gnome-pkg-tools,

Added: desktop/wheezy/libsoup2.4/debian/patches/01_ntlm_domain.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/libsoup2.4/debian/patches/01_ntlm_domain.patch?rev=41302&op=file
==============================================================================
--- desktop/wheezy/libsoup2.4/debian/patches/01_ntlm_domain.patch	(added)
+++ desktop/wheezy/libsoup2.4/debian/patches/01_ntlm_domain.patch	[utf-8] Fri Apr 11 14:10:06 2014
@@ -0,0 +1,51 @@
+From 501d327ad2312a97fb585369f3537563b8d296fc Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw at gnome.org>
+Date: Tue, 16 Oct 2012 10:55:18 -0400
+Subject: soup-auth-manager-ntlm.c: don't include the default domain in the
+ response
+
+If the user didn't specify a domain in their username, then send ""
+for the domain in the response, rather than echoing back the default
+domain. This is apparently more compatible with what other apps do.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=624613
+
+diff --git a/libsoup/soup-auth-manager-ntlm.c b/libsoup/soup-auth-manager-ntlm.c
+index f2b67d1..ecb9c7c 100644
+--- a/libsoup/soup-auth-manager-ntlm.c
++++ b/libsoup/soup-auth-manager-ntlm.c
+@@ -459,7 +459,7 @@ ssofailure:
+ 		*slash = '\0';
+ 		username = slash + 1;
+ 	} else
+-		domain = conn->domain;
++		domain = g_strdup ("");
+ 
+ 	conn->response_header = soup_ntlm_response (conn->nonce,
+ 						    username, password,
+@@ -470,8 +470,7 @@ ssofailure:
+ 	soup_session_requeue_message (priv->session, msg);
+ 
+ done:
+-	if (domain != conn->domain)
+-		g_free (domain);
++	g_free (domain);
+ 	g_free (conn->domain);
+ 	conn->domain = NULL;
+ 	g_free (conn->nonce);
+diff --git a/tests/ntlm-test.c b/tests/ntlm-test.c
+index 00222e8..e473ba6 100644
+--- a/tests/ntlm-test.c
++++ b/tests/ntlm-test.c
+@@ -24,7 +24,7 @@ typedef enum {
+ 
+ #define NTLM_CHALLENGE "TlRMTVNTUAACAAAADAAMADAAAAABAoEAASNFZ4mrze8AAAAAAAAAAGIAYgA8AAAARABPAE0AQQBJAE4AAgAMAEQATwBNAEEASQBOAAEADABTAEUAUgBWAEUAUgAEABQAZABvAG0AYQBpAG4ALgBjAG8AbQADACIAcwBlAHIAdgBlAHIALgBkAG8AbQBhAGkAbgAuAGMAbwBtAAAAAAA="
+ 
+-#define NTLM_RESPONSE_USER(response) ((response)[102] == 'E' ? NTLM_AUTHENTICATED_ALICE : NTLM_AUTHENTICATED_BOB)
++#define NTLM_RESPONSE_USER(response) ((response)[86] == 'E' ? NTLM_AUTHENTICATED_ALICE : NTLM_AUTHENTICATED_BOB)
+ 
+ static void
+ clear_state (gpointer connections, GObject *ex_connection)
+-- 
+cgit v0.10.1
+

Modified: desktop/wheezy/libsoup2.4/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/libsoup2.4/debian/patches/series?rev=41302&op=diff
==============================================================================
--- desktop/wheezy/libsoup2.4/debian/patches/series	[utf-8] (original)
+++ desktop/wheezy/libsoup2.4/debian/patches/series	[utf-8] Fri Apr 11 14:10:06 2014
@@ -0,0 +1 @@
+01_ntlm_domain.patch