basic_sspi_auth: fix MinGW compile errors

diff --git a/helpers/basic_auth/SSPI/Makefile.am b/helpers/basic_auth/SSPI/Makefile.am
index a99ebf0dfda06ab1627492f077f52f45329b065b..9be0715767322feeda9b15d53d650c79ba89bf56 100644 (file)
--- 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 dc2425dc5fb716f04e8cf2736878ed10a3244825..7fcc7c097e8875774878b604ed7f1963045c573a 100644 (file)
--- 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 909b203832df805069db0f6014bf06d3472e8b06..d94883ae589815288bbf71c994fad1c45b0363b2 100644 (file)
--- 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>