---------------------
PatchSet 842 
Date: 2003/08/03 17:12:01
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed some MinGW/gcc compile problems

Members: 
	include/sspwin32.h:1.2.18.1->1.2.18.2 
	lib/sspwin32.c:1.2.18.1->1.2.18.2 
	lib/win32lib.c:1.2.18.2->1.2.18.3 

Index: squid3/include/sspwin32.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/sspwin32.h,v
retrieving revision 1.2.18.1
retrieving revision 1.2.18.2
diff -u -r1.2.18.1 -r1.2.18.2
--- squid3/include/sspwin32.h	25 Feb 2003 02:48:30 -0000	1.2.18.1
+++ squid3/include/sspwin32.h	3 Aug 2003 17:12:28 -0000	1.2.18.2
@@ -36,9 +36,24 @@
 #define SSP_BASIC 1
 #define SSP_NTLM 2
 
+typedef struct _AUTH_SEQ {
+    BOOL fInitialized;
+    BOOL fHaveCredHandle;
+    BOOL fHaveCtxtHandle;
+    CredHandle hcred;
+    struct _SecHandle hctxt;
+} AUTH_SEQ, *PAUTH_SEQ;
+
+static HMODULE hModule;
+static int NTLM_mode = SSP_BASIC;
+SECURITY_STATUS ss = SEC_E_OK;
+
 HMODULE LoadSecurityDll(int);
 void UnloadSecurityDll(void);
 BOOL WINAPI SSPLogonUser(PTSTR, PTSTR, PTSTR);
+BOOL GenClientContext(PAUTH_SEQ, PSEC_WINNT_AUTH_IDENTITY, PVOID, DWORD, PVOID, PDWORD, PBOOL);
+BOOL GenServerContext(PAUTH_SEQ, PVOID, DWORD, PVOID, PDWORD, PBOOL);
+
 
 extern SECURITY_STATUS ss;
 
Index: squid3/lib/sspwin32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/sspwin32.c,v
retrieving revision 1.2.18.1
retrieving revision 1.2.18.2
diff -u -r1.2.18.1 -r1.2.18.2
--- squid3/lib/sspwin32.c	25 Feb 2003 02:48:32 -0000	1.2.18.1
+++ squid3/lib/sspwin32.c	3 Aug 2003 17:12:01 -0000	1.2.18.2
@@ -20,18 +20,6 @@
 #include "util.h"
 #include "sspwin32.h"
 
-typedef struct _AUTH_SEQ {
-    BOOL fInitialized;
-    BOOL fHaveCredHandle;
-    BOOL fHaveCtxtHandle;
-    CredHandle hcred;
-    struct _SecHandle hctxt;
-} AUTH_SEQ, *PAUTH_SEQ;
-
-static HMODULE hModule;
-static int NTLM_mode = SSP_BASIC;
-SECURITY_STATUS ss = SEC_E_OK;
-
 /* Function pointers */
 ACCEPT_SECURITY_CONTEXT_FN _AcceptSecurityContext = NULL;
 ACQUIRE_CREDENTIALS_HANDLE_FN _AcquireCredentialsHandle = NULL;
@@ -181,7 +169,7 @@
     ULONG           fContextAttr;
 
     if (!pAS->fInitialized) {
-	ss = _AcquireCredentialsHandle(NULL, _T(NTLM_PACKAGE_NAME), 
+	ss = _AcquireCredentialsHandle(NULL, (SEC_CHAR *)_T(NTLM_PACKAGE_NAME), 
 	    SECPKG_CRED_OUTBOUND, NULL, (NTLM_mode == SSP_NTLM) ? NULL : pAuthIdentity, NULL, NULL,
 	    &pAS->hcred, &tsExpiry);
 	if (ss < 0) {
@@ -264,7 +252,7 @@
     ULONG           fContextAttr;
 
     if (!pAS->fInitialized)  {
-	ss = _AcquireCredentialsHandle(NULL, _T("NTLM"), 
+	ss = _AcquireCredentialsHandle(NULL, (SEC_CHAR *)_T("NTLM"), 
 	    SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, &pAS->hcred, 
 	    &tsExpiry);
 	if (ss < 0) {
@@ -340,7 +328,7 @@
 	if (!hModule)
 	    break;
 	/* Get max token size */
-	_QuerySecurityPackageInfo(_T("NTLM"), &pSPI);
+	_QuerySecurityPackageInfo((SEC_CHAR *)_T("NTLM"), &pSPI);
 	cbMaxToken = pSPI->cbMaxToken;
 	_FreeContextBuffer(pSPI);
 
Index: squid3/lib/win32lib.c
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/win32lib.c,v
retrieving revision 1.2.18.2
retrieving revision 1.2.18.3
diff -u -r1.2.18.2 -r1.2.18.3
--- squid3/lib/win32lib.c	15 Mar 2003 11:12:38 -0000	1.2.18.2
+++ squid3/lib/win32lib.c	3 Aug 2003 17:12:01 -0000	1.2.18.3
@@ -1,5 +1,5 @@
 /*
- * $Id: win32lib.c,v 1.2.18.2 2003/03/15 11:12:38 serassio Exp $
+ * $Id: win32lib.c,v 1.2.18.3 2003/08/03 17:12:01 serassio Exp $
  *
  * * * * * * * * Legal stuff * * * * * * *
  *
@@ -34,7 +34,7 @@
  *
  */
 
-#include "config.h"
+#include "util.h"
 
 /* The following code section is part of an EXPERIMENTAL native */
 /* Windows NT/2000 Squid port - Compiles only on MS Visual C++  */