kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #131 from CendioOssman/gss

Browse Source 
Use standard GSSAPI rather than libgssglue
This commit is contained in:
Henrik Andersson 2017-08-14 12:24:46 +02:00 committed by GitHub
commit 70faf7c7bd
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -122,27 +122,20 @@ fi
dnl CredSSP feature dnl CredSSP feature
AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP])) AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]),
[static_gssglue=yes], [static_gssglue=no])
AS_IF([test "x$enable_credssp" != "xno"], [ AS_IF([test "x$enable_credssp" != "xno"], [
if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG"; then
PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0]) PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
fi fi
if test x"$WITH_CREDSSP" = "x1"; then if test x"$WITH_CREDSSP" = "x1"; then
CREDSSPOBJ="cssp.o" CREDSSPOBJ="cssp.o"
CFLAGS="$CFLAGS $GSSGLUE_CFLAGS" CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
LIBS="$LIBS $GSSAPI_LIBS"
AS_IF([test "x$static_gssglue" != "xno"], [
LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic"
], [
LIBS="$LIBS -lgssglue"
])
AC_DEFINE(WITH_CREDSSP) AC_DEFINE(WITH_CREDSSP)
else else
echo echo
echo "CredSSP support requires libgssglue, install the dependency" echo "CredSSP support requires GSSAPI, install the dependency"
echo "or disable the feature using --disable-credssp." echo "or disable the feature using --disable-credssp."
echo echo
exit 1 exit 1

4
cssp.c
View File

@ -173,7 +173,7 @@ cssp_gss_get_service_name(char *server, gss_name_t * name)
} }
static RD_BOOL static RD_BOOL
cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in, STREAM out)
{ {
int conf_state; int conf_state;
OM_uint32 major_status; OM_uint32 major_status;
@ -212,7 +212,7 @@ cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out)
} }
static RD_BOOL static RD_BOOL
cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in, STREAM out)
{ {
OM_uint32 major_status; OM_uint32 major_status;
OM_uint32 minor_status; OM_uint32 minor_status;