Merge pull request #31 from conserver/fix-gssapi-freebsd-check

Fix gssapi freebsd check

.cirrus.yml

@@ -22,6 +22,11 @@ freebsd_12_task:
     - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
     - make
     - make test
+  gssapi_script:
+    - "[ -f Makefile ] && make distclean"
+    - ./configure --with-gssapi || { cat config.log; exit 1; }
+    - make
+    - make test
 
 linux_gcc_task:
   container:

configure.ac

@@ -612,6 +612,7 @@ AC_ARG_WITH(gssapi,
 	    [LIBS="$oLIBS -lgssapi"
 	    AC_MSG_CHECKING(for gssapi library -lgssapi)
 	    AC_TRY_LINK([#include <gssapi/gssapi.h>
+			 #include <stdio.h>
 		],[gss_create_empty_oid_set(NULL, NULL)],
 		[AC_MSG_RESULT(yes)
 		cons_with_gssapi="YES"
@@ -621,6 +622,7 @@ AC_ARG_WITH(gssapi,
 		LIBS="$oLIBS -lgssglue"
 		AC_MSG_CHECKING(for gssapi library -lgssglue)
 		AC_TRY_LINK([#include <gssapi/gssapi.h>
+			     #include <stdio.h>
 		    ],[gss_create_empty_oid_set(NULL, NULL)],
 		    [AC_MSG_RESULT(yes)
 		    cons_with_gssapi="YES"
@@ -630,6 +632,7 @@ AC_ARG_WITH(gssapi,
 		    LIBS="$oLIBS -lgss"
 		    AC_MSG_CHECKING(for gssapi library -lgss)
 		    AC_TRY_LINK([#include <gssapi/gssapi.h>
+				 #include <stdio.h>
 			],[gss_create_empty_oid_set(NULL, NULL)],
 			[AC_MSG_RESULT(yes)
 			cons_with_gssapi="YES"

conserver/group.h

@@ -83,3 +83,6 @@ extern void SendIWaitClientsMsg(CONSENT *, char *);
 #if HAVE_OPENSSL
 extern int AttemptSSL(CONSCLIENT *);
 #endif
+#if HAVE_GSSAPI
+extern int AttemptGSSAPI(CONSCLIENT *);
+#endif

package/setup-configure

@@ -5,6 +5,9 @@ set -e
 curl -s -o config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess'
 curl -s -o config.sub 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub'
 
+grep ^timestamp config.guess >/dev/null 2>&1 || cp package/config.guess .
+grep ^timestamp config.sub >/dev/null 2>&1 || cp package/config.sub .
+
 # We set lang to avoid this with the gcc docker image on cirrus:
 # 
 #   ./package/setup-configure