From b676bbbfc691a0664687322aba2c7b9af932abe8 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 30 Apr 2024 14:01:53 +0200 Subject: [PATCH] TEST-46-HOMED: Check for sshd pam snippet in /usr/lib/pam.d as well opensuse ships pam snippets in /usr/lib/pam.d. --- test/units/testsuite-46.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/units/testsuite-46.sh b/test/units/testsuite-46.sh index d9ba83aa82..7d84b0d04d 100755 --- a/test/units/testsuite-46.sh +++ b/test/units/testsuite-46.sh @@ -511,7 +511,11 @@ if command -v ssh &>/dev/null && command -v sshd &>/dev/null && ! [[ -v ASAN_OPT rm -f /tmp/homed.id_ecdsa /run/systemd/system/mysshserver{@.service,.socket} systemctl daemon-reload homectl remove homedsshtest - mv /etc/pam.d/sshd.bak /etc/pam.d/sshd + for dir in /etc /usr/lib; do + if [[ -f "$dir/pam.d/sshd.bak" ]]; then + mv "$dir/pam.d/sshd.bak" "$dir/pam.d/sshd" + fi + done } trap at_exit EXIT @@ -538,8 +542,10 @@ if command -v ssh &>/dev/null && command -v sshd &>/dev/null && ! [[ -v ASAN_OPT # are aware of distros use mkdir -p /usr/share/empty.sshd /var/empty /var/empty/sshd /run/sshd - mv /etc/pam.d/sshd /etc/pam.d/sshd.bak - cat >/etc/pam.d/sshd <"$dir/pam.d/sshd" </etc/ssh/sshd_config <