Addressed review comments
This commit is contained in:
parent
7ddc43aeea
commit
c69a26e9b4
51
configure.ac
51
configure.ac
@ -65,7 +65,7 @@ if test "x$with_systemdsystemunitdir" != xno; then
|
|||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
|
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
|
||||||
|
|
||||||
AC_ARG_ENABLE(pam, AS_HELP_STRING([--disable-pam],
|
AC_ARG_ENABLE(pam, AS_HELP_STRING([--enable-pam],
|
||||||
[Build PAM support (default: yes)]),
|
[Build PAM support (default: yes)]),
|
||||||
[], [enable_pam=yes])
|
[], [enable_pam=yes])
|
||||||
AM_CONDITIONAL(SESMAN_NOPAM, [test x$enable_pam != xyes])
|
AM_CONDITIONAL(SESMAN_NOPAM, [test x$enable_pam != xyes])
|
||||||
@ -79,7 +79,7 @@ AC_ARG_ENABLE(ipv6only, AS_HELP_STRING([--enable-ipv6only],
|
|||||||
[Build IPv6-only (default: no)]),
|
[Build IPv6-only (default: no)]),
|
||||||
[], [enable_ipv6only=no])
|
[], [enable_ipv6only=no])
|
||||||
AC_ARG_ENABLE(kerberos, AS_HELP_STRING([--enable-kerberos],
|
AC_ARG_ENABLE(kerberos, AS_HELP_STRING([--enable-kerberos],
|
||||||
[Build kerberos support (prefer PAM if available) (default: no)]),
|
[Build kerberos support (prefer --enable-pam if available) (default: no)]),
|
||||||
[], [enable_kerberos=no])
|
[], [enable_kerberos=no])
|
||||||
AC_ARG_ENABLE(bsd, AS_HELP_STRING([--enable-bsd],
|
AC_ARG_ENABLE(bsd, AS_HELP_STRING([--enable-bsd],
|
||||||
[Build BSD auth support (default: no)]),
|
[Build BSD auth support (default: no)]),
|
||||||
@ -87,7 +87,7 @@ AC_ARG_ENABLE(bsd, AS_HELP_STRING([--enable-bsd],
|
|||||||
AM_CONDITIONAL(SESMAN_BSD, [test x$bsd = xtrue])
|
AM_CONDITIONAL(SESMAN_BSD, [test x$bsd = xtrue])
|
||||||
AM_CONDITIONAL(SESMAN_KERBEROS, [test x$enable_kerberos = xyes])
|
AM_CONDITIONAL(SESMAN_KERBEROS, [test x$enable_kerberos = xyes])
|
||||||
AC_ARG_ENABLE(pamuserpass, AS_HELP_STRING([--enable-pamuserpass],
|
AC_ARG_ENABLE(pamuserpass, AS_HELP_STRING([--enable-pamuserpass],
|
||||||
[Build pam userpass support (default: no)]),
|
[Build PAM userpass support (default: no)]),
|
||||||
[], [enable_pamuserpass=no])
|
[], [enable_pamuserpass=no])
|
||||||
AM_CONDITIONAL(SESMAN_PAMUSERPASS, [test x$enable_pamuserpass = xyes])
|
AM_CONDITIONAL(SESMAN_PAMUSERPASS, [test x$enable_pamuserpass = xyes])
|
||||||
AC_ARG_ENABLE(pam-config, AS_HELP_STRING([--enable-pam-config=CONF],
|
AC_ARG_ENABLE(pam-config, AS_HELP_STRING([--enable-pam-config=CONF],
|
||||||
@ -183,7 +183,7 @@ PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
|
|||||||
OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
|
OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
|
||||||
AC_PATH_PROGS([OPENSSL], [openssl], [:], [$OPENSSL_BIN:$PATH])
|
AC_PATH_PROGS([OPENSSL], [openssl], [:], [$OPENSSL_BIN:$PATH])
|
||||||
|
|
||||||
# checking for pam variation
|
# checking for PAM variation
|
||||||
# Linux-PAM is used in Linux systems
|
# Linux-PAM is used in Linux systems
|
||||||
# OpenPAM is used by FreeBSD, NetBSD, DragonFly BSD and OS X
|
# OpenPAM is used by FreeBSD, NetBSD, DragonFly BSD and OS X
|
||||||
# OpenBSD uses BSD Authentication rather than both PAMs
|
# OpenBSD uses BSD Authentication rather than both PAMs
|
||||||
@ -192,16 +192,42 @@ AC_CHECK_HEADER([security/_pam_types.h],
|
|||||||
AC_CHECK_HEADER([security/pam_constants.h],
|
AC_CHECK_HEADER([security/pam_constants.h],
|
||||||
[AC_DEFINE([HAVE_PAM_CONSTANTS_H], 1, [Using OpenPAM], [])])
|
[AC_DEFINE([HAVE_PAM_CONSTANTS_H], 1, [Using OpenPAM], [])])
|
||||||
|
|
||||||
|
# Check only one auth mechanism is specified, and give it a name
|
||||||
|
auth_cnt=0
|
||||||
|
auth_mech="Builtin"
|
||||||
|
if test x$enable_pam = xyes
|
||||||
|
then
|
||||||
|
auth_cnt=`expr $auth_cnt + 1`
|
||||||
|
auth_mech="PAM"
|
||||||
|
fi
|
||||||
|
if test x$bsd = xtrue
|
||||||
|
then
|
||||||
|
auth_cnt=`expr $auth_cnt + 1`
|
||||||
|
auth_mech="BSD"
|
||||||
|
fi
|
||||||
|
if test x$enable_kerberos = xyes
|
||||||
|
then
|
||||||
|
auth_cnt=`expr $auth_cnt + 1`
|
||||||
|
auth_mech="Kerberos"
|
||||||
|
fi
|
||||||
|
if test x$enable_pamuserpass = xyes
|
||||||
|
then
|
||||||
|
auth_cnt=`expr $auth_cnt + 1`
|
||||||
|
auth_mech="PAM userpass"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test $auth_cnt -gt 1
|
||||||
|
then
|
||||||
|
AC_MSG_ERROR([--enable-pam, --enable-bsd, --enable-pamuserpass and --enable-kerberos are mutually exclusive])
|
||||||
|
fi
|
||||||
|
|
||||||
# checking if pam should be autodetected.
|
# checking if pam should be autodetected.
|
||||||
if test "x$enable_pam" = "xyes"
|
if test "x$enable_pam" = "xyes"
|
||||||
then
|
then
|
||||||
if test "x$enable_kerberos" != "xyes"
|
if test -z "$enable_bsd"
|
||||||
then
|
then
|
||||||
if test -z "$enable_bsd"
|
AC_CHECK_HEADER([security/pam_appl.h], [],
|
||||||
then
|
[AC_MSG_ERROR([please install libpam0g-dev or pam-devel])])
|
||||||
AC_CHECK_HEADER([security/pam_appl.h], [],
|
|
||||||
[AC_MSG_ERROR([please install libpam0g-dev or pam-devel])])
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if test "x$enable_pam_config" = "x"; then
|
if test "x$enable_pam_config" = "x"; then
|
||||||
PAM_RULES="auto"
|
PAM_RULES="auto"
|
||||||
@ -237,7 +263,7 @@ then
|
|||||||
AC_DEFINE([XRDP_ENABLE_IPV6],1,[Enable IPv6])
|
AC_DEFINE([XRDP_ENABLE_IPV6],1,[Enable IPv6])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$enable_pam" != "xyes" || test "x$bsd" = "xtrue"
|
if test "x$enable_pam" != "xyes"
|
||||||
then
|
then
|
||||||
AC_DEFINE([USE_NOPAM],1,[Disable PAM])
|
AC_DEFINE([USE_NOPAM],1,[Disable PAM])
|
||||||
fi
|
fi
|
||||||
@ -395,8 +421,7 @@ echo " fuse $enable_fuse"
|
|||||||
echo " ipv6 $enable_ipv6"
|
echo " ipv6 $enable_ipv6"
|
||||||
echo " ipv6only $enable_ipv6only"
|
echo " ipv6only $enable_ipv6only"
|
||||||
echo " vsock $enable_vsock"
|
echo " vsock $enable_vsock"
|
||||||
echo " pam $enable_pam"
|
echo " auth mechanism $auth_mech"
|
||||||
echo " kerberos $enable_kerberos"
|
|
||||||
echo " debug $enable_xrdpdebug"
|
echo " debug $enable_xrdpdebug"
|
||||||
echo " rdpsndaudin $enable_rdpsndaudin"
|
echo " rdpsndaudin $enable_rdpsndaudin"
|
||||||
echo ""
|
echo ""
|
||||||
|
Loading…
Reference in New Issue
Block a user