SHA256
1
0
forked from pool/libsoup

Accepting request 391318 from GNOME:Next

1

OBS-URL: https://build.opensuse.org/request/show/391318
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsoup?expand=0&rev=175
This commit is contained in:
Bjørn Lie 2016-04-22 17:35:16 +00:00 committed by Git OBS Bridge
parent f7743d9683
commit b7a0d96e95
3 changed files with 52 additions and 0 deletions

View File

@ -0,0 +1,43 @@
From 1ec0dca73385705179457f2c6fcd043fe4563ecc Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 19 Apr 2016 18:50:24 +0200
Subject: NTLM auth failure with latest samba
https://bugzilla.gnome.org/show_bug.cgi?id=765106
---
libsoup/soup-auth-ntlm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libsoup/soup-auth-ntlm.c b/libsoup/soup-auth-ntlm.c
index 926fd4a..68029ae 100644
--- a/libsoup/soup-auth-ntlm.c
+++ b/libsoup/soup-auth-ntlm.c
@@ -359,6 +359,7 @@ soup_auth_ntlm_update_connection (SoupConnectionAuth *auth, SoupMessage *msg,
conn->state = SOUP_NTLM_SSO_FAILED;
success = FALSE;
} else if (!g_ascii_strcasecmp (response, "PW")) {
+ conn->state = SOUP_NTLM_SSO_FAILED;
priv->sso_available = FALSE;
g_free (response);
} else {
@@ -489,7 +490,7 @@ soup_auth_ntlm_get_connection_authorization (SoupConnectionAuth *auth,
priv->sso_available = FALSE;
}
} else {
- g_warning ("NTLM single-sign-on using %s failed", NTLM_AUTH);
+ g_debug ("NTLM single-sign-on using %s failed", NTLM_AUTH);
}
}
/* If NTLM single-sign-on fails, go back to original
@@ -525,7 +526,7 @@ soup_auth_ntlm_get_connection_authorization (SoupConnectionAuth *auth,
#ifdef USE_NTLM_AUTH
case SOUP_NTLM_SSO_FAILED:
/* Restart request without SSO */
- g_warning ("NTLM single-sign-on by using %s failed", NTLM_AUTH);
+ g_debug ("NTLM single-sign-on by using %s failed", NTLM_AUTH);
priv->sso_available = FALSE;
header = soup_ntlm_request ();
conn->state = SOUP_NTLM_SENT_REQUEST;
--
cgit v0.12

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 22 17:02:56 UTC 2016 - zaitor@opensuse.org
- Add libsoup-auth-ntlm-fix.patch: Fix NTLM auth failure with
latest samba (bgo#765106, boo#976110).
-------------------------------------------------------------------
Fri Mar 25 13:50:24 UTC 2016 - zaitor@opensuse.org

View File

@ -25,6 +25,8 @@ Release: 0
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/libsoup/2.54/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libsoup-auth-ntlm-fix.patch boo#976110 bgo#765106 zaitor@opensuse.org -- Fix NTLM auth failure with latest samba
Patch0: libsoup-auth-ntlm-fix.patch
BuildRequires: glib-networking
BuildRequires: glib2-devel >= 2.38.0
BuildRequires: gobject-introspection-devel
@ -120,6 +122,7 @@ Features:
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build