From ce44c970f913d2a047903dba8670554ac42fc479 Mon Sep 17 00:00:00 2001 From: "bluhm@openbsd.org" Date: Mon, 26 Sep 2016 21:34:38 +0000 Subject: upstream commit Allow to run ssh regression tests as root. If the user is already root, the test should not expect that SUDO is set. If ssh needs another user, use sudo or doas to switch from root if necessary. OK dtucker@ Upstream-Regress-ID: b464e55185ac4303529e3e6927db41683aaeace2 --- regress/sftp-chroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'regress/sftp-chroot.sh') diff --git a/regress/sftp-chroot.sh b/regress/sftp-chroot.sh index 9c26eb680..4ea2fce85 100644 --- a/regress/sftp-chroot.sh +++ b/regress/sftp-chroot.sh @@ -1,4 +1,4 @@ -# $OpenBSD: sftp-chroot.sh,v 1.4 2014/01/20 00:00:30 dtucker Exp $ +# $OpenBSD: sftp-chroot.sh,v 1.5 2016/09/26 21:34:38 bluhm Exp $ # Placed in the Public Domain. tid="sftp in chroot" @@ -7,7 +7,7 @@ CHROOT=/var/run FILENAME=testdata_${USER} PRIVDATA=${CHROOT}/${FILENAME} -if [ -z "$SUDO" ]; then +if [ -z "$SUDO" -a ! -w /var/run ]; then echo "skipped: need SUDO to create file in /var/run, test won't work without" exit 0 fi -- cgit v1.2.3