---------------------
PatchSet 8655 
Date: 2006/09/17 09:05:10
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fix many gcc warnings

Members: 
	helpers/external_acl/mswin_lm_group/win32_check_group.c:1.1.2.5->1.1.2.6 

Index: squid/helpers/external_acl/mswin_lm_group/win32_check_group.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/mswin_lm_group/win32_check_group.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- squid/helpers/external_acl/mswin_lm_group/win32_check_group.c	17 Sep 2006 08:51:20 -0000	1.1.2.5
+++ squid/helpers/external_acl/mswin_lm_group/win32_check_group.c	17 Sep 2006 09:05:10 -0000	1.1.2.6
@@ -335,7 +335,7 @@
     LPWSTR UsrDCptr = NULL;
     LPGROUP_USERS_INFO_0 pUsrBuf = NULL;
     LPGROUP_USERS_INFO_0 pTmpBuf;
-    LPSERVER_INFO_101 pSrvBuf = NULL;
+    LPSERVER_INFO_101 pSrvBuf;
     DWORD dwLevel = 0;
     DWORD dwPrefMaxLen = -1;
     DWORD dwEntriesRead = 0;
@@ -343,6 +343,7 @@
     NET_API_STATUS nStatus;
     DWORD i;
     DWORD dwTotalCount = 0;
+    LPBYTE pBufTmp = NULL;
 
     strncpy(NTDomain, UserName, sizeof(NTDomain));
 
@@ -372,7 +373,8 @@
 
 /* Call the NetServerGetInfo function for local computer, specifying level 101. */
     dwLevel = 101;
-    nStatus = NetServerGetInfo(NULL, dwLevel, (LPBYTE *) & pSrvBuf);
+    nStatus = NetServerGetInfo(NULL, dwLevel, &pBufTmp);
+    pSrvBuf = (LPSERVER_INFO_101) pBufTmp;
 
     if (nStatus == NERR_Success) {
 	/* Check if we are running on a Domain Controller */
@@ -380,8 +382,11 @@
 	    (pSrvBuf->sv101_type & SV_TYPE_DOMAIN_BAKCTRL)) {
 	    LclDCptr = NULL;
 	    debug("Running on a DC.\n");
-	} else
-	    nStatus = (use_PDC_only ? NetGetDCName(NULL, wszLocalDomain, (LPBYTE *) & LclDCptr) : NetGetAnyDCName(NULL, wszLocalDomain, (LPBYTE *) & LclDCptr));
+	} else {
+            pBufTmp = NULL;
+	    nStatus = (use_PDC_only ? NetGetDCName(NULL, wszLocalDomain, &pBufTmp) : NetGetAnyDCName(NULL, wszLocalDomain, &pBufTmp));
+            LclDCptr = (LPWSTR) pBufTmp;
+        }
     } else {
 	fprintf(stderr, "%s NetServerGetInfo() failed.'\n", myname);
 	if (pSrvBuf != NULL)
@@ -395,7 +400,9 @@
 	if (strcmp(NTDomain, machinedomain) != 0) {
 	    MultiByteToWideChar(CP_ACP, 0, NTDomain,
 		strlen(NTDomain) + 1, wszUserDomain, sizeof(wszUserDomain) / sizeof(wszUserDomain[0]));
-	    nStatus = (use_PDC_only ? NetGetDCName(LclDCptr, wszUserDomain, (LPBYTE *) & UsrDCptr) : NetGetAnyDCName(LclDCptr, wszUserDomain, (LPBYTE *) & UsrDCptr));
+            pBufTmp = NULL;
+	    nStatus = (use_PDC_only ? NetGetDCName(LclDCptr, wszUserDomain, &pBufTmp) : NetGetAnyDCName(LclDCptr, wszUserDomain, &pBufTmp));
+            UsrDCptr = (LPWSTR) pBufTmp;
 	    if (nStatus != NERR_Success) {
 		fprintf(stderr, "%s Can't find DC for user's domain '%s'\n", myname, NTDomain);
 		if (pSrvBuf != NULL)
@@ -415,13 +422,15 @@
 	 * specifying information level 0.
 	 */
 	dwLevel = 0;
+        pBufTmp = NULL;
 	nStatus = NetUserGetGroups(UsrDCptr,
 	    wszUserName,
 	    dwLevel,
-	    (LPBYTE *) & pUsrBuf,
+	    &pBufTmp,
 	    dwPrefMaxLen,
 	    &dwEntriesRead,
 	    &dwTotalEntries);
+	pUsrBuf = (LPGROUP_USERS_INFO_0)pBufTmp;
 	/*
 	 * If the call succeeds,
 	 */