From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 31 Dec 2014 02:55:22 +0000 (-0800)
Subject: basic_sspi_auth: fix MinGW compile errors
X-Git-Tag: merge-candidate-3-v1~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b9cb90606c353944ec470ec78f45d4bc6015fff;p=thirdparty%2Fsquid.git

basic_sspi_auth: fix MinGW compile errors
---

diff --git a/helpers/basic_auth/SSPI/Makefile.am b/helpers/basic_auth/SSPI/Makefile.am
index a99ebf0dfd..9be0715767 100644
--- a/helpers/basic_auth/SSPI/Makefile.am
+++ b/helpers/basic_auth/SSPI/Makefile.am
@@ -19,10 +19,9 @@ basic_sspi_auth_SOURCES = \
 	valid.cc valid.h
 basic_sspi_auth_CXXFLAGS = -Wl,--enable-auto-import
 basic_sspi_auth_LDADD = \
+	$(top_builddir)/lib/libsspwin32.la \
+	$(top_builddir)/lib/libmiscencoding.la \
 	$(COMPAT_LIB) \
-	-L$(top_builddir)/lib \
-	-lsspwin32 \
-	-lmiscencoding \
 	-lnetapi32 -ladvapi32 \
 	$(XTRA_LIBS)
 
diff --git a/helpers/basic_auth/SSPI/valid.cc b/helpers/basic_auth/SSPI/valid.cc
index dc2425dc5f..7fcc7c097e 100644
--- a/helpers/basic_auth/SSPI/valid.cc
+++ b/helpers/basic_auth/SSPI/valid.cc
@@ -124,13 +124,6 @@ Valid_Group(char *UserName, char *Group)
     return result;
 }
 
-/* Valid_User return codes -
-   0 - User authenticated successfully.
-   1 - Server error.
-   2 - Group membership error.
-   3 - Logon error; Incorrect password or username given.
-*/
-
 int
 Valid_User(char *UserName, char *Password, char *Group)
 {
diff --git a/helpers/basic_auth/SSPI/valid.h b/helpers/basic_auth/SSPI/valid.h
index 909b203832..d94883ae58 100644
--- a/helpers/basic_auth/SSPI/valid.h
+++ b/helpers/basic_auth/SSPI/valid.h
@@ -67,6 +67,16 @@ extern int debug_enabled;
 extern char Default_NTDomain[DNLEN+1];
 extern const char * errormsg;
 
+/**
+ * Valid_User return codes.
+ *
+ * \retval 0   User authenticated successfully.
+ * \retval 1   Server error.
+ * \retval 2   Group membership error.
+ * \retval 3   Logon error; Incorrect password or username given.
+ */
+int Valid_User(char *UserName, char *Password, char *Group);
+
 /* Debugging stuff */
 #if defined(__GNUC__)           /* this is really a gcc-ism */
 #include <unistd.h>