tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
bluhm@openbsd.org 2016-09-26 21:34:38 +00:00 committed by Damien Miller
parent 8d05784785
commit ce44c970f9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
regress/agent-getpeereid.sh
View File

@ -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. # Placed in the Public Domain.
tid="disallow agent attach from other uid" tid="disallow agent attach from other uid"

2
regress/keys-command.sh
View File

@ -3,7 +3,7 @@
tid="authorized keys from command" tid="authorized keys from command"
if test -z "$SUDO" ; then if [ -z "$SUDO" -a ! -w /var/run ]; then
echo "skipped (SUDO not set)" echo "skipped (SUDO not set)"
echo "need SUDO to create file in /var/run, test won't work without" echo "need SUDO to create file in /var/run, test won't work without"
exit 0 exit 0

4
regress/principals-command.sh
View File

@ -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. # Placed in the Public Domain.
tid="authorized principals command" tid="authorized principals command"
@ -6,7 +6,7 @@ tid="authorized principals command"
rm -f $OBJ/user_ca_key* $OBJ/cert_user_key* rm -f $OBJ/user_ca_key* $OBJ/cert_user_key*
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak 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 "skipped (SUDO not set)"
echo "need SUDO to create file in /var/run, test won't work without" echo "need SUDO to create file in /var/run, test won't work without"
exit 0 exit 0

4
regress/sftp-chroot.sh
View File

@ -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. # Placed in the Public Domain.
tid="sftp in chroot" tid="sftp in chroot"
@ -7,7 +7,7 @@ CHROOT=/var/run
FILENAME=testdata_${USER} FILENAME=testdata_${USER}
PRIVDATA=${CHROOT}/${FILENAME} 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" echo "skipped: need SUDO to create file in /var/run, test won't work without"
exit 0 exit 0
fi fi