From a20fc02bda77dea232b0e3eb82dca9bef7dc3861 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 May 2017 15:41:56 -0400 Subject: fixo --- src/grp-login/.gitignore | 1 - src/grp-login/pam_systemd/.gitignore | 1 + src/grp-login/pam_systemd/Makefile | 2 +- src/grp-login/pam_systemd/systemd-user.pam.m4 | 12 ++++++++++++ src/grp-login/systemd-logind/systemd-user.pam.m4 | 12 ------------ 5 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 src/grp-login/pam_systemd/.gitignore create mode 100644 src/grp-login/pam_systemd/systemd-user.pam.m4 delete mode 100644 src/grp-login/systemd-logind/systemd-user.pam.m4 (limited to 'src') diff --git a/src/grp-login/.gitignore b/src/grp-login/.gitignore index 3a8ba497c1..4e5702a8e8 100644 --- a/src/grp-login/.gitignore +++ b/src/grp-login/.gitignore @@ -3,4 +3,3 @@ /org.freedesktop.login1.policy /71-seat.rules /73-seat-late.rules -/systemd-user diff --git a/src/grp-login/pam_systemd/.gitignore b/src/grp-login/pam_systemd/.gitignore new file mode 100644 index 0000000000..f3bb5b971b --- /dev/null +++ b/src/grp-login/pam_systemd/.gitignore @@ -0,0 +1 @@ +/systemd-user diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile index 2243572b11..4239d23df5 100644 --- a/src/grp-login/pam_systemd/Makefile +++ b/src/grp-login/pam_systemd/Makefile @@ -47,7 +47,7 @@ pamlib_LTLIBRARIES = \ pam_systemd.la ifneq ($(ENABLE_PAM_CONFIG),) -dist_pamconf_DATA = \ +nodist_pamconf_DATA = \ src/login/systemd-user endif diff --git a/src/grp-login/pam_systemd/systemd-user.pam.m4 b/src/grp-login/pam_systemd/systemd-user.pam.m4 new file mode 100644 index 0000000000..e33963b125 --- /dev/null +++ b/src/grp-login/pam_systemd/systemd-user.pam.m4 @@ -0,0 +1,12 @@ +# This file is part of systemd. +# +# Used by systemd --user instances. + +account required pam_unix.so + +m4_ifdef(`HAVE_SELINUX', +session required pam_selinux.so close +session required pam_selinux.so nottys open +)m4_dnl +session required pam_loginuid.so +session optional pam_systemd.so diff --git a/src/grp-login/systemd-logind/systemd-user.pam.m4 b/src/grp-login/systemd-logind/systemd-user.pam.m4 deleted file mode 100644 index e33963b125..0000000000 --- a/src/grp-login/systemd-logind/systemd-user.pam.m4 +++ /dev/null @@ -1,12 +0,0 @@ -# This file is part of systemd. -# -# Used by systemd --user instances. - -account required pam_unix.so - -m4_ifdef(`HAVE_SELINUX', -session required pam_selinux.so close -session required pam_selinux.so nottys open -)m4_dnl -session required pam_loginuid.so -session optional pam_systemd.so -- cgit v1.2.3-54-g00ecf