From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 13 Oct 2012 05:29:03 +0000 (-0600)
Subject: libsspwin32: SSP_LogonUser takes char * parameters
X-Git-Tag: SQUID_3_4_0_1~569
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=308f92d716504a6d12bde14ce9a8b7d55755461f;p=thirdparty%2Fsquid.git

libsspwin32: SSP_LogonUser takes char * parameters

There is no need to cast these parameters via void*. Both the library
and the basic auth helper(s) that use it work with char* strings.
---

diff --git a/include/sspwin32.h b/include/sspwin32.h
index 8e7a2ec688..666e918e04 100644
--- a/include/sspwin32.h
+++ b/include/sspwin32.h
@@ -70,7 +70,7 @@ extern "C" {
 
     HMODULE LoadSecurityDll(int, const char *);
     void UnloadSecurityDll(void);
-    BOOL WINAPI SSP_LogonUser(PTSTR, PTSTR, PTSTR);
+    BOOL WINAPI SSP_LogonUser(unsigned char *, unsigned char *, unsigned char *);
     BOOL WINAPI SSP_ValidateNTLMCredentials(PVOID, int, char *);
     const char * WINAPI SSP_ValidateNegotiateCredentials(PVOID, int, PBOOL, int *, char *);
     const char * WINAPI SSP_MakeChallenge(PVOID, int);
diff --git a/lib/sspwin32.cc b/lib/sspwin32.cc
index 32acd0fb8a..ee857b688a 100644
--- a/lib/sspwin32.cc
+++ b/lib/sspwin32.cc
@@ -422,11 +422,11 @@ BOOL WINAPI SSP_LogonUser(PTSTR szUser, PTSTR szPassword, PTSTR szDomain)
 
         /* Initialize auth identity structure */
         ZeroMemory(&ai, sizeof(ai));
-        ai.Domain = (void *)szDomain;
+        ai.Domain = (unsigned char *)szDomain;
         ai.DomainLength = lstrlen(szDomain);
-        ai.User = (void *)szUser;
+        ai.User = (unsigned char *)szUser;
         ai.UserLength = lstrlen(szUser);
-        ai.Password = (void *)szPassword;
+        ai.Password = (unsigned char *)szPassword;
         ai.PasswordLength = lstrlen(szPassword);
 #if defined(UNICODE) || defined(_UNICODE)
         ai.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE;