author | Wolfgang Rosenauer <wr@rosenauer.org> |
Wed, 24 Oct 2012 10:25:01 +0200 | |
branch | firefox16 |
changeset 566 | 8db070554ee6 |
parent 515 | 0f6539389500 |
child 541 | 830e50bbfc79 |
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> |
515 | 3 |
# Parent 4f5fe2278cd5cff898ad762457312f60a7e82a67 |
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 |
515 | 9 |
@@ -168,17 +168,17 @@ static PRUint8* 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, |
228
9ba8fb8909c4
fix GIO helper app launch (bnc#672903) (mozilla-gio-launch-uri.patch)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
nsnull |
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) |