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