From cf15fdd29ffd3ab99a5fef8014afd7da77a62b45 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 24 Mar 2025 03:18:26 +0100 Subject: [PATCH] tests: use `setfacl` if available Closes #1565 --- tests/test_sshd.test | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/test_sshd.test b/tests/test_sshd.test index b7a303f0..fd316411 100755 --- a/tests/test_sshd.test +++ b/tests/test_sshd.test @@ -102,10 +102,14 @@ if [ -n "${SSH}" ]; then echo "# ssh log: '${logfcli}'" chmod go-rwx "${PRIVKEY}" if [[ "${uname}" = *'_NT'* ]]; then - export MSYS2_ARG_CONV_EXCL='/reset' - icacls "${PRIVKEY}" /reset - icacls "${PRIVKEY}" /grant:r "${USERNAME}:(R)" - icacls "${PRIVKEY}" /inheritance:r + if [ -x /bin/setfacl ]; then + /bin/setfacl --remove-all "${PRIVKEY}" + else + export MSYS2_ARG_CONV_EXCL='/reset' + icacls "${PRIVKEY}" /reset + icacls "${PRIVKEY}" /grant:r "${USERNAME}:(R)" + icacls "${PRIVKEY}" /inheritance:r + fi fi count=1 # shellcheck disable=SC2086