mozilla-ntlm-full-path.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Sun, 09 Apr 2017 10:37:43 +0200
changeset 956 5353413a2411
parent 869 0dd25a92df97
child 994 9fc447b00040
permissions -rw-r--r--
53.0b9
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
869
0dd25a92df97 working FF 40 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 541
diff changeset
     4
# Parent  03565086f1e230cf6f0f6c01bf9a792c732de50b
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
869
0dd25a92df97 working FF 40 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 541
diff changeset
    10
@@ -169,17 +169,17 @@ static uint8_t* ExtractMessage(const nsA
228
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 nsresult
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 nsAuthSambaNTLM::SpawnNTLMAuthHelper()
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 {
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
     const char* username = PR_GetEnv("USER");
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
     if (!username)
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
         return NS_ERROR_FAILURE;
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
 
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
    18
     const char* const args[] = {
228
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
-        "ntlm_auth",
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
+        "/usr/bin/ntlm_auth",
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
         "--helper-protocol", "ntlmssp-client-1",
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
         "--use-cached-creds",
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
    23
         "--username", username,
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 515
diff changeset
    24
         nullptr
228
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
     };
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
 
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
    27
     bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, &mFromChildFD, &mToChildFD);
228
9ba8fb8909c4 fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
     if (!isOK)