mozilla-ntlm-full-path.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 02 Nov 2021 13:21:17 +0100
branchfirefox91
changeset 1167 7852ceef239b
parent 1123 7fa561e5d7c7
permissions -rw-r--r--
Firefox 91.2.0esr
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
228
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User Petr Cerny <pcerny@novell.com>
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 515
diff changeset
     3
# Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6
1123
7fa561e5d7c7 Firefox 74.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1085
diff changeset
     4
# Parent  2361c5db1e70e358b2158325e07fa15bb4569c2c
228
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
Bug 634334 - call to the ntlm_auth helper fails
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
--- a/extensions/auth/nsAuthSambaNTLM.cpp
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
+++ b/extensions/auth/nsAuthSambaNTLM.cpp
1085
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    10
@@ -156,17 +156,17 @@ static uint8_t* ExtractMessage(const nsA
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    11
   *aLen = (length / 4) * 3 - numEquals;
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    12
   return reinterpret_cast<uint8_t*>(PL_Base64Decode(s, length, nullptr));
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    13
 }
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    14
 
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    15
 nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() {
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    16
   const char* username = PR_GetEnv("USER");
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    17
   if (!username) return NS_ERROR_FAILURE;
228
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
 
1085
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    19
-  const char* const args[] = {"ntlm_auth",
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    20
+  const char* const args[] = {"/usr/bin/ntlm_auth",
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    21
                               "--helper-protocol",
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    22
                               "ntlmssp-client-1",
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    23
                               "--use-cached-creds",
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    24
                               "--username",
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    25
                               username,
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    26
                               nullptr};
228
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
 
1085
87f893cf45b9 Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    28
   bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID,