From e875cd2af5a25b58ffadf1768a5776235ac2c5fe Mon Sep 17 00:00:00 2001 From: Boris Bopp Date: Fri, 23 Mar 2018 19:34:23 +0100 Subject: [PATCH] instfiles: Add pam.d config for arch linux. --- configure.ac | 2 +- instfiles/pam.d/Makefile.am | 3 ++- instfiles/pam.d/mkpamrules | 5 +++++ instfiles/pam.d/xrdp-sesman.arch | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 instfiles/pam.d/xrdp-sesman.arch diff --git a/configure.ac b/configure.ac index 4a41128a..da9aa36c 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(pamuserpass, AS_HELP_STRING([--enable-pamuserpass], [], [enable_pamuserpass=no]) AM_CONDITIONAL(SESMAN_PAMUSERPASS, [test x$enable_pamuserpass = xyes]) AC_ARG_ENABLE(pam-config, AS_HELP_STRING([--enable-pam-config=CONF], - [Select PAM config to install: debian, redhat, suse, freebsd, unix + [Select PAM config to install: arch, debian, redhat, suse, freebsd, unix (default: autodetect)])) AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug], diff --git a/instfiles/pam.d/Makefile.am b/instfiles/pam.d/Makefile.am index 72031575..4d772a3a 100644 --- a/instfiles/pam.d/Makefile.am +++ b/instfiles/pam.d/Makefile.am @@ -4,7 +4,8 @@ PAM_FILES = \ xrdp-sesman.suse \ xrdp-sesman.freebsd \ xrdp-sesman.macos \ - xrdp-sesman.unix + xrdp-sesman.unix \ + xrdp-sesman.arch EXTRA_DIST = $(PAM_FILES) mkpamrules diff --git a/instfiles/pam.d/mkpamrules b/instfiles/pam.d/mkpamrules index 2d268281..e1c0ef45 100755 --- a/instfiles/pam.d/mkpamrules +++ b/instfiles/pam.d/mkpamrules @@ -35,6 +35,11 @@ guess_rules () return fi + if test -s "$pamdir/system-remote-login"; then + rules="arch" + return + fi + rules="unix" return } diff --git a/instfiles/pam.d/xrdp-sesman.arch b/instfiles/pam.d/xrdp-sesman.arch new file mode 100644 index 00000000..d303ab79 --- /dev/null +++ b/instfiles/pam.d/xrdp-sesman.arch @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-remote-login +account include system-remote-login +password include system-remote-login +session include system-remote-login