From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Thu, 29 Jun 2023 18:20:28 +0000 (+0000)
Subject: basic_sspi_auth: MinGW build fixes (#1399)
X-Git-Tag: SQUID_7_0_1~411
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcab7ad5aa36dde26c460d70825133e7c3536d45;p=thirdparty%2Fsquid.git

basic_sspi_auth: MinGW build fixes (#1399)

Also, remove #error check preventing cross-compile
---

diff --git a/src/auth/basic/SSPI/basic_sspi_auth.cc b/src/auth/basic/SSPI/basic_sspi_auth.cc
index 317fc9aa3c..3da82077a5 100644
--- a/src/auth/basic/SSPI/basic_sspi_auth.cc
+++ b/src/auth/basic/SSPI/basic_sspi_auth.cc
@@ -42,12 +42,6 @@
 #include <getopt.h>
 #endif
 
-/* Check if we try to compile on a Windows Platform */
-#if !_SQUID_WINDOWS_
-/* NON Windows Platform !!! */
-#error NON WINDOWS PLATFORM
-#endif
-
 static char NTGroup[256];
 char * NTAllowedGroup;
 char * NTDisAllowedGroup;
@@ -73,7 +67,7 @@ usage(const char *name)
             name);
 }
 
-void
+static void
 process_options(int argc, char *argv[])
 {
     int opt;
diff --git a/src/auth/basic/SSPI/valid.cc b/src/auth/basic/SSPI/valid.cc
index 5191033aec..0fba1fc7bc 100644
--- a/src/auth/basic/SSPI/valid.cc
+++ b/src/auth/basic/SSPI/valid.cc
@@ -35,18 +35,10 @@
 */
 
 #include "squid.h"
+#include "auth/basic/SSPI/valid.h"
 #include "util.h"
 
-/* Check if we try to compile on a Windows Platform */
-#if !_SQUID_WINDOWS_
-/* NON Windows Platform !!! */
-#error NON WINDOWS PLATFORM
-#endif
-
-#if _SQUID_CYGWIN_
 #include <cwchar>
-#endif
-#include "auth/basic/SSPI/valid.h"
 
 char Default_NTDomain[DNLEN+1] = NTV_DEFAULT_DOMAIN;
 const char * errormsg;
@@ -57,7 +49,7 @@ const char NTV_LOGON_ERROR_MSG[] = "No such user or wrong password";
 const char NTV_VALID_DOMAIN_SEPARATOR[] = "\\/";
 
 /* returns 1 on success, 0 on failure */
-int
+static int
 Valid_Group(char *UserName, char *Group)
 {
     int result = FALSE;
@@ -125,7 +117,7 @@ Valid_Group(char *UserName, char *Group)
 }
 
 int
-Valid_User(char *UserName, char *Password, char *Group)
+Valid_User(char *UserName, char *Password, char *)
 {
     int result = NTV_SERVER_ERROR;
     size_t i;
@@ -135,7 +127,7 @@ Valid_User(char *UserName, char *Password, char *Group)
     char User[256];
 
     errormsg = NTV_SERVER_ERROR_MSG;
-    strncpy(NTDomain, UserName, sizeof(NTDomain));
+    xstrncpy(NTDomain, UserName, sizeof(NTDomain));
 
     for (i=0; i < strlen(NTV_VALID_DOMAIN_SEPARATOR); ++i) {
         if ((domain_qualify = strchr(NTDomain, NTV_VALID_DOMAIN_SEPARATOR[i])) != NULL)