1 # HG changeset patch |
1 # HG changeset patch |
2 # User Petr Cerny <pcerny@novell.com> |
2 # User Petr Cerny <pcerny@novell.com> |
3 # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 |
3 # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 |
4 # Parent 46dd9332e67440fb779e99a694a2bf0edf5c203e |
4 # Parent 6ab277cf616dc2748e9855101100a97a6cec10a6 |
5 Bug 634334 - call to the ntlm_auth helper fails |
5 Bug 634334 - call to the ntlm_auth helper fails |
6 |
6 |
7 diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp |
7 diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp |
8 --- a/extensions/auth/nsAuthSambaNTLM.cpp |
8 --- a/extensions/auth/nsAuthSambaNTLM.cpp |
9 +++ b/extensions/auth/nsAuthSambaNTLM.cpp |
9 +++ b/extensions/auth/nsAuthSambaNTLM.cpp |
10 @@ -170,17 +170,17 @@ static uint8_t* ExtractMessage(const nsA |
10 @@ -156,17 +156,17 @@ static uint8_t* ExtractMessage(const nsA |
11 nsresult |
11 *aLen = (length / 4) * 3 - numEquals; |
12 nsAuthSambaNTLM::SpawnNTLMAuthHelper() |
12 return reinterpret_cast<uint8_t*>(PL_Base64Decode(s, length, nullptr)); |
13 { |
13 } |
14 const char* username = PR_GetEnv("USER"); |
|
15 if (!username) |
|
16 return NS_ERROR_FAILURE; |
|
17 |
14 |
18 const char* const args[] = { |
15 nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { |
19 - "ntlm_auth", |
16 const char* username = PR_GetEnv("USER"); |
20 + "/usr/bin/ntlm_auth", |
17 if (!username) return NS_ERROR_FAILURE; |
21 "--helper-protocol", "ntlmssp-client-1", |
|
22 "--use-cached-creds", |
|
23 "--username", username, |
|
24 nullptr |
|
25 }; |
|
26 |
18 |
27 bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, &mFromChildFD, &mToChildFD); |
19 - const char* const args[] = {"ntlm_auth", |
28 if (!isOK) |
20 + const char* const args[] = {"/usr/bin/ntlm_auth", |
|
21 "--helper-protocol", |
|
22 "ntlmssp-client-1", |
|
23 "--use-cached-creds", |
|
24 "--username", |
|
25 username, |
|
26 nullptr}; |
|
27 |
|
28 bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, |