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

1 files changed, 2 insertions, 2 deletions

diff --git a/regress/principals-command.sh b/regress/principals-command.sh
index 19d7d6c96..680bd957f 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