ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2024-12-20 05:17:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix gssapi freebsd check
This commit is contained in:
Bryan Stansell 2019-03-29 19:27:20 -07:00 committed by GitHub
commit e77500eb11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3454 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.cirrus.yml
View File

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

3
configure.ac
View File

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

3
conserver/group.h
View File

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

1645
package/config.guess vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1795
package/config.sub vendored Normal file
View File

File diff suppressed because it is too large Load Diff

3
package/setup-configure
View File

@ -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.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' 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: # We set lang to avoid this with the gcc docker image on cirrus:
# #
# ./package/setup-configure # ./package/setup-configure