diff options
author | Mike Gilbert <floppym@gentoo.org> | 2020-11-03 10:48:10 -0500 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2020-11-03 10:48:10 -0500 |
commit | 38ec013fbbf4b11185706d21fd079881f628f272 (patch) | |
tree | 0270096657f8dbc94dbfc54e75e5e30937ad5936 /sys-apps | |
parent | sys-apps/systemd: bump to 246.6 (diff) | |
download | gentoo-38ec013fbbf4b11185706d21fd079881f628f272.tar.gz gentoo-38ec013fbbf4b11185706d21fd079881f628f272.tar.bz2 gentoo-38ec013fbbf4b11185706d21fd079881f628f272.zip |
sys-apps/systemd: include system-auth in PAM config
Closes: https://bugs.gentoo.org/751199
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/systemd/files/gentoo-pam.patch | 33 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-246.6.ebuild | 1 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/sys-apps/systemd/files/gentoo-pam.patch b/sys-apps/systemd/files/gentoo-pam.patch new file mode 100644 index 000000000000..4d022b508ba6 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-pam.patch @@ -0,0 +1,33 @@ +From b744751e2ced66c2ec191e8bd490cb9bdffc630a Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Tue, 3 Nov 2020 10:42:51 -0500 +Subject: [PATCH] pam: include system-auth for systemd --user + +--- + src/login/systemd-user.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4 +index f6313f79fe..bcf84b4c64 100644 +--- a/src/login/systemd-user.m4 ++++ b/src/login/systemd-user.m4 +@@ -5,7 +5,7 @@ + m4_ifdef(`ENABLE_HOMED', + -account sufficient pam_systemd_home.so + )m4_dnl +-account sufficient pam_unix.so ++account include system-auth + account required pam_permit.so + + m4_ifdef(`HAVE_SELINUX', +@@ -13,6 +13,7 @@ session required pam_selinux.so close + session required pam_selinux.so nottys open + )m4_dnl + session required pam_loginuid.so ++session include system-auth + session optional pam_keyinit.so force revoke + m4_ifdef(`ENABLE_HOMED', + -session optional pam_systemd_home.so +-- +2.29.0 + diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild index 3cca3239a602..4c0c36991484 100644 --- a/sys-apps/systemd/systemd-246.6.ebuild +++ b/sys-apps/systemd/systemd-246.6.ebuild @@ -210,6 +210,7 @@ src_prepare() { "${FILESDIR}/gentoo-generator-path-r2.patch" "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" "${FILESDIR}/gentoo-journald-audit.patch" + "${FILESDIR}/gentoo-pam.patch" ) fi diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 3cca3239a602..4c0c36991484 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -210,6 +210,7 @@ src_prepare() { "${FILESDIR}/gentoo-generator-path-r2.patch" "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" "${FILESDIR}/gentoo-journald-audit.patch" + "${FILESDIR}/gentoo-pam.patch" ) fi |