diff options
| author | bluhm@openbsd.org <bluhm@openbsd.org> | 2016-09-26 21:34:38 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-10-01 06:44:00 +1000 |
| commit | ce44c970f913d2a047903dba8670554ac42fc479 (patch) | |
| tree | 27d0a9067e7d9669e5422ba6ef2f2cc9b59fbf48 | |
| parent | 8d0578478586e283e751ca51e7b0690631da139a (diff) | |
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
| -rw-r--r-- | regress/agent-getpeereid.sh | 2 | ||||
| -rw-r--r-- | regress/keys-command.sh | 2 | ||||
| -rw-r--r-- | regress/principals-command.sh | 4 | ||||
| -rw-r--r-- | regress/sftp-chroot.sh | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh index 24b71f45..91621a59 100644 --- a/regress/agent-getpeereid.sh +++ b/regress/agent-getpeereid.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent-getpeereid.sh,v 1.6 2016/05/03 14:41:04 djm Exp $ +# $OpenBSD: agent-getpeereid.sh,v 1.7 2016/09/26 21:34:38 bluhm Exp $ # Placed in the Public Domain. tid="disallow agent attach from other uid" diff --git a/regress/keys-command.sh b/regress/keys-command.sh index af68cf15..9c9ada7c 100644 --- a/regress/keys-command.sh +++ b/regress/keys-command.sh @@ -3,7 +3,7 @@ tid="authorized keys from command" -if test -z "$SUDO" ; then +if [ -z "$SUDO" -a ! -w /var/run ]; then echo "skipped (SUDO not set)" echo "need SUDO to create file in /var/run, test won't work without" exit 0 diff --git a/regress/principals-command.sh b/regress/principals-command.sh index 19d7d6c9..680bd957 100644 --- a/regress/principals-command.sh +++ b/regress/principals-command.sh @@ -1,4 +1,4 @@ -# $OpenBSD: principals-command.sh,v 1.2 2016/09/21 01:35:12 djm Exp $ +# $OpenBSD: principals-command.sh,v 1.3 2016/09/26 21:34:38 bluhm Exp $ # Placed in the Public Domain. tid="authorized principals command" @@ -6,7 +6,7 @@ tid="authorized principals command" rm -f $OBJ/user_ca_key* $OBJ/cert_user_key* cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak -if test -z "$SUDO" ; then +if [ -z "$SUDO" -a ! -w /var/run ]; then echo "skipped (SUDO not set)" echo "need SUDO to create file in /var/run, test won't work without" exit 0 diff --git a/regress/sftp-chroot.sh b/regress/sftp-chroot.sh index 9c26eb68..4ea2fce8 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 |