]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
libntlmauth: fix Unicode support on Windows
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 1 Dec 2013 06:57:22 +0000 (23:57 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 1 Dec 2013 06:57:22 +0000 (23:57 -0700)
ntlmauth.h header defines NTLM flags with NTLM_* prefix now.

  This is an iCelero Project

lib/sspwin32.c

index 6ffa912d9f67936390596c3c1cec68b08a159394..b4c3be839b6233d3e511cc72446a2cf08186c4e3 100644 (file)
  */
 
 #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;