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 2361c5db1e70e358b2158325e07fa15bb4569c2c |
4 # Parent 1c6a565013e4c5f3494f964269783939cd5ed0b8 |
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 @@ -156,17 +156,17 @@ static uint8_t* ExtractMessage(const nsA |
10 @@ -160,7 +160,7 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthH |
11 *aLen = (length / 4) * 3 - numEquals; |
|
12 return reinterpret_cast<uint8_t*>(PL_Base64Decode(s, length, nullptr)); |
|
13 } |
|
14 |
|
15 nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { |
|
16 const char* username = PR_GetEnv("USER"); |
11 const char* username = PR_GetEnv("USER"); |
17 if (!username) return NS_ERROR_FAILURE; |
12 if (!username) return NS_ERROR_FAILURE; |
18 |
13 |
19 - const char* const args[] = {"ntlm_auth", |
14 - const char* const args[] = {"ntlm_auth", |
20 + const char* const args[] = {"/usr/bin/ntlm_auth", |
15 + const char* const args[] = {"/usr/bin/ntlm_auth", |
21 "--helper-protocol", |
16 "--helper-protocol", |
22 "ntlmssp-client-1", |
17 "ntlmssp-client-1", |
23 "--use-cached-creds", |
18 "--use-cached-creds", |
24 "--username", |
|
25 username, |
|
26 nullptr}; |
|
27 |
|
28 bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, |
|