| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Sat, 10 Sep 2011 09:48:33 +0200 | |
| branch | mozilla-1.9.2 |
| changeset 309 | 0e3ea8d0df6a |
| parent 227 | 9f0ffc441295 |
| permissions | -rw-r--r-- |
|
227
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# User Petr Cerny <pcerny@novell.com> |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# Parent 685ce8f9d8549783e9643907b9e95a3efda526f0 |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
|
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
--- a/extensions/auth/nsAuthSambaNTLM.cpp |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
+++ b/extensions/auth/nsAuthSambaNTLM.cpp |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
@@ -200,17 +200,17 @@ static PRUint8* ExtractMessage(const nsA |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
nsresult |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
nsAuthSambaNTLM::SpawnNTLMAuthHelper() |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
{
|
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
const char* username = PR_GetEnv("USER");
|
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
if (!username) |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
return NS_ERROR_FAILURE; |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
|
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
char* args[] = {
|
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
- "ntlm_auth", |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
+ "/usr/bin/ntlm_auth", |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
"--helper-protocol", "ntlmssp-client-1", |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
"--use-cached-creds", |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
"--username", const_cast<char*>(username), |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
nsnull |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
}; |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
|
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
PRBool isOK = SpawnIOChild(args, &mChildPID, &mFromChildFD, &mToChildFD); |
|
9f0ffc441295
mozilla-ntlm-full-path.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
if (!isOK) |