From: Darren Tucker <dtucker@dtucker.net>
Date: Thu, 18 Aug 2022 11:36:39 +0000 (+1000)
Subject: Check for perms to run agent-getpeereid test.
X-Git-Tag: V_9_1_P1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e;p=thirdparty%2Fopenssh-portable.git

Check for perms to run agent-getpeereid test.

Ubuntu 22.04 defaults to private home dirs which prevents "nobody"
running ssh-add during the agent-getpeereid test.  Check for this and
add the necessary permissions.
---

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index fe5e13ff0..7dec34bee 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -19,7 +19,17 @@ export DEBIAN_FRONTEND=noninteractive
 
 set -ex
 
-lsb_release -a
+if [ -x "`which lsb_release 2>&1`" ]; then
+	lsb_release -a
+fi
+
+# Ubuntu 22.04 defaults to private home dirs which prevent the
+# agent-getpeerid test from running ssh-add as nobody.  See
+# https://github.com/actions/runner-images/issues/6106
+if [ ! -z "$SUDO" ] && ! "$SUDO" -u nobody test -x ~; then
+	echo ~ is not executable by nobody, adding perms.
+	chmod go+x ~
+fi
 
 if [ "${TARGETS}" = "kitchensink" ]; then
 	TARGETS="krb5 libedit pam sk selinux"