From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 1 Dec 2013 06:57:22 +0000 (-0700)
Subject: libntlmauth: fix Unicode support on Windows
X-Git-Tag: SQUID_3_3_12~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b68874f4835b97c7e814811d12ed5fa6b80540b3;p=thirdparty%2Fsquid.git

libntlmauth: fix Unicode support on Windows

ntlmauth.h header defines NTLM flags with NTLM_* prefix now.

  This is an iCelero Project
---

diff --git a/lib/sspwin32.c b/lib/sspwin32.c
index 6ffa912d9f..b4c3be839b 100644
--- a/lib/sspwin32.c
+++ b/lib/sspwin32.c
@@ -32,10 +32,10 @@
  */
 
 #include "squid.h"
-#include "util.h"
-
-#include "libntlmauth/ntlmauth.h"
+#include "base64.h"
+#include "ntlmauth/ntlmauth.h"
 #include "sspwin32.h"
+#include "util.h"
 
 typedef struct _AUTH_SEQ {
     BOOL fInitialized;
@@ -513,8 +513,8 @@ const char * WINAPI SSP_MakeChallenge(PVOID PNegotiateBuf, int NegotiateLen)
     } while (0);
     if (fResult != NULL) {
         challenge = (ntlm_challenge *) fResult;
-        Use_Unicode = NEGOTIATE_UNICODE & challenge->flags;
-        NTLM_LocalCall = NEGOTIATE_THIS_IS_LOCAL_CALL & challenge->flags;
+        Use_Unicode = NTLM_NEGOTIATE_UNICODE & challenge->flags;
+        NTLM_LocalCall = NTLM_NEGOTIATE_THIS_IS_LOCAL_CALL & challenge->flags;
         encoded = base64_encode_bin((char *) fResult, cbOut);
     }
     return encoded;