diff -r e8d4a33582b8 -r 554cd9503f75 mozilla-ntlm-full-path.patch --- a/mozilla-ntlm-full-path.patch Mon Dec 10 22:33:01 2018 +0100 +++ b/mozilla-ntlm-full-path.patch Tue Mar 19 09:49:20 2019 +0100 @@ -1,28 +1,28 @@ # HG changeset patch # User Petr Cerny # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 -# Parent 46dd9332e67440fb779e99a694a2bf0edf5c203e +# Parent eb453c9206ce11b34633ece0c68e79d3e7124e64 Bug 634334 - call to the ntlm_auth helper fails diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp --- a/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp -@@ -170,17 +170,17 @@ static uint8_t* ExtractMessage(const nsA - nsresult - nsAuthSambaNTLM::SpawnNTLMAuthHelper() - { - const char* username = PR_GetEnv("USER"); - if (!username) - return NS_ERROR_FAILURE; +@@ -156,17 +156,17 @@ static uint8_t* ExtractMessage(const nsA + *aLen = (length / 4) * 3 - numEquals; + return reinterpret_cast(PL_Base64Decode(s, length, nullptr)); + } + + nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { + const char* username = PR_GetEnv("USER"); + if (!username) return NS_ERROR_FAILURE; - const char* const args[] = { -- "ntlm_auth", -+ "/usr/bin/ntlm_auth", - "--helper-protocol", "ntlmssp-client-1", - "--use-cached-creds", - "--username", username, - nullptr - }; +- const char* const args[] = {"ntlm_auth", ++ const char* const args[] = {"/usr/bin/ntlm_auth", + "--helper-protocol", + "ntlmssp-client-1", + "--use-cached-creds", + "--username", + username, + nullptr}; - bool isOK = SpawnIOChild(const_cast(args), &mChildPID, &mFromChildFD, &mToChildFD); - if (!isOK) + bool isOK = SpawnIOChild(const_cast(args), &mChildPID,