mozilla-ntlm-full-path.patch
changeset 515 0f6539389500
parent 367 3fabd9f66322
child 541 830e50bbfc79
--- a/mozilla-ntlm-full-path.patch	Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-ntlm-full-path.patch	Wed Jul 25 11:15:27 2012 +0200
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Petr Cerny <pcerny@novell.com>
-# Parent a843037ea4cee813a68dd529e7a503d1e40b81e4
+# Parent 4f5fe2278cd5cff898ad762457312f60a7e82a67
 Bug 634334 - call to the ntlm_auth helper fails
 
 diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
 --- a/extensions/auth/nsAuthSambaNTLM.cpp
 +++ b/extensions/auth/nsAuthSambaNTLM.cpp
-@@ -200,17 +200,17 @@ static PRUint8* ExtractMessage(const nsA
+@@ -168,17 +168,17 @@ static PRUint8* ExtractMessage(const nsA
  nsresult
  nsAuthSambaNTLM::SpawnNTLMAuthHelper()
  {
@@ -14,14 +14,14 @@
      if (!username)
          return NS_ERROR_FAILURE;
  
-     char* args[] = {
+     const char* const args[] = {
 -        "ntlm_auth",
 +        "/usr/bin/ntlm_auth",
          "--helper-protocol", "ntlmssp-client-1",
          "--use-cached-creds",
-         "--username", const_cast<char*>(username),
+         "--username", username,
          nsnull
      };
  
-     bool isOK = SpawnIOChild(args, &mChildPID, &mFromChildFD, &mToChildFD);
+     bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, &mFromChildFD, &mToChildFD);
      if (!isOK)