From 0aa7b6c2aae502673a1b6c3d6eb444e87d1a8626b7bfd7cc116a8a1d6ded2ca8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 5 Apr 2023 14:18:51 +0000 Subject: [PATCH] Accepting request 1077511 from home:mkoutny:pam-nl - su.pamd: Fixup common-session-nonlogin usage - runuser.pamd, su.pamd: Guard common-session-nonlogin away for <=15 codestreams More info in https://github.com/SUSE/pam-config/pull/16 OBS-URL: https://build.opensuse.org/request/show/1077511 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=508 --- su.pamd | 2 +- util-linux.changes | 7 +++++++ util-linux.spec | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/su.pamd b/su.pamd index 66e4e37..1e49cc0 100644 --- a/su.pamd +++ b/su.pamd @@ -4,5 +4,5 @@ auth include common-auth account sufficient pam_rootok.so account include common-account password include common-password -session include common-session +session include common-session-nonlogin session optional pam_xauth.so diff --git a/util-linux.changes b/util-linux.changes index 1c3da9b..0dcd8f1 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 31 13:02:13 UTC 2023 - Michal Koutný + +- su.pamd: Fixup common-session-nonlogin usage +- runuser.pamd, su.pamd: Guard common-session-nonlogin away for <=15 codestreams + More info in https://github.com/SUSE/pam-config/pull/16 + ------------------------------------------------------------------- Mon Mar 27 08:10:15 UTC 2023 - Thorsten Kukuk diff --git a/util-linux.spec b/util-linux.spec index de62690..2f11f0b 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -549,8 +549,14 @@ mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_sysconfdir}/i install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote +%if 0%{?suse_version} <= 1500 +sed -i '/^session/s/common-session-nonlogin/common-session/g' %{SOURCE14} +%endif install -m 644 %{SOURCE14} %{buildroot}%{_pam_vendordir}/runuser install -m 644 %{SOURCE15} %{buildroot}%{_pam_vendordir}/runuser-l +%if 0%{?suse_version} <= 1500 +sed -i '/^session/s/common-session-nonlogin/common-session/g' %{SOURCE10} +%endif install -m 644 %{SOURCE10} %{buildroot}%{_pam_vendordir}/su install -m 644 %{SOURCE16} %{buildroot}%{_pam_vendordir}/su-l install -m 644 %{SOURCE11} %{buildroot}%{_distconfdir}/default/su