Merge branch 'master' into f24

firefox.spec

@@ -92,7 +92,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        46.0.1
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -137,6 +137,7 @@ Patch306:        mozilla-1245076-1.patch
 Patch400:        mozilla-1255590.patch
 Patch402:        mozilla-1196777.patch
 Patch403:        mozilla-1216658.patch
+Patch404:        mozilla-1270046.patch
 
 # Debian patches
 Patch500:        mozilla-440908.patch
@@ -282,6 +283,7 @@ cd %{tarballdir}
 %patch400 -p1 -b .1255590
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .1216658
+%patch404 -p1 -b .1270046
 
 # Debian extension patch
 %patch500 -p1 -b .440908
@@ -801,6 +803,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue May 10 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-3
+- Added patch for rhbz#1332875 - new Samba auth reponse
+
 * Thu May 5 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-2
 - Disable dark theme until we support it correctly (mozbz#1216658)
 

mozilla-1270046.patch

@@ -0,0 +1,12 @@
+--- firefox-46.0.1/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156	2016-05-03 06:31:11.000000000 +0100
++++ firefox-46.0.1/extensions/auth/nsAuthSambaNTLM.cpp	2016-05-04 10:18:53.157429123 +0100
+@@ -256,7 +256,8 @@ nsAuthSambaNTLM::GetNextToken(const void
+     nsCString line;
+     if (!ReadLine(mFromChildFD, line))
+         return NS_ERROR_FAILURE;
+-    if (!StringBeginsWith(line, NS_LITERAL_CSTRING("KK "))) {
++    if (!StringBeginsWith(line, NS_LITERAL_CSTRING("KK ")) &&
++        !StringBeginsWith(line, NS_LITERAL_CSTRING("AF "))) {
+         // Something went wrong. Perhaps no credentials are accessible.
+         return NS_ERROR_FAILURE;
+     }