author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sat, 14 Sep 2013 20:56:00 +0200 | |
branch | firefox24 |
changeset 664 | 1276f5ff4bcb |
parent 541 | 830e50bbfc79 |
child 869 | 0dd25a92df97 |
permissions | -rw-r--r-- |
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 |
228
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
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
|
5 |
|
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
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
|
7 |
--- 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
|
8 |
+++ b/extensions/auth/nsAuthSambaNTLM.cpp |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
9 |
@@ -168,17 +168,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
|
10 |
nsresult |
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
nsAuthSambaNTLM::SpawnNTLMAuthHelper() |
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
{ |
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
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
|
14 |
if (!username) |
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
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
|
16 |
|
515 | 17 |
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
|
18 |
- "ntlm_auth", |
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
+ "/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
|
20 |
"--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
|
21 |
"--use-cached-creds", |
515 | 22 |
"--username", username, |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
23 |
nullptr |
228
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
}; |
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
|
515 | 26 |
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
|
27 |
if (!isOK) |