------------------------------------------------------------
revno: 12669
revision-id: squid3@treenet.co.nz-20131201065722-mpt32kk87okttvbb
parent: squid3@treenet.co.nz-20131130135416-4dfq83sa743304f4
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Sat 2013-11-30 23:57:22 -0700
message:
  libntlmauth: fix Unicode support on Windows
  
  ntlmauth.h header defines NTLM flags with NTLM_* prefix now.
  
    This is an iCelero Project
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131201065722-mpt32kk87okttvbb
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 257399ef380a6bcb9af2a5ed9cd4b9c5dceb25da
# timestamp: 2013-12-01 07:53:26 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20131130135416-\
#   4dfq83sa743304f4
# 
# Begin patch
=== modified file 'lib/sspwin32.c'
--- lib/sspwin32.c	2012-09-01 14:38:36 +0000
+++ lib/sspwin32.c	2013-12-01 06:57:22 +0000
@@ -32,11 +32,11 @@
  */
 
 #include "squid.h"
+#include "base64.h"
+#include "ntlmauth/ntlmauth.h"
+#include "sspwin32.h"
 #include "util.h"
 
-#include "libntlmauth/ntlmauth.h"
-#include "sspwin32.h"
-
 typedef struct _AUTH_SEQ {
     BOOL fInitialized;
     BOOL fHaveCredHandle;
@@ -513,8 +513,8 @@
     } 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;