From: dtucker <dtucker@openbsd.org>
Date: Tue, 31 Oct 2023 04:15:40 +0000 (+0000)
Subject: Don't try to use sudo inside sshd log wrapper.  We still need to
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=015a2f38ac009d4ed48a14f2153eafcaf4844e24;p=openbsd

Don't try to use sudo inside sshd log wrapper.  We still need to
check if we're using sudo since we don't want to chown unecessarily,
as on some platforms this causes an error which pollutes stderr.
We also don't want to unnecessarily invoke sudo, since it's running
in the context of the proxycommand, on *other* platforms it may not
be able to authenticate, and if we're using SUDO then it should
already be privileged.
---

diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index f7354793bf5..1dba670a7ef 100644
--- a/regress/usr.bin/ssh/test-exec.sh
+++ b/regress/usr.bin/ssh/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.104 2023/10/31 02:58:45 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.105 2023/10/31 04:15:40 dtucker Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -217,7 +217,7 @@ timestamp="\`$OBJ/timestamp\`"
 logfile="${TEST_SSH_LOGDIR}/\${timestamp}.sshd.\$\$.log"
 rm -f $TEST_SSHD_LOGFILE
 touch \$logfile
-test -z "$SUDO" || "$SUDO" chown $USER \$logfile
+test -z "$SUDO" || chown $USER \$logfile
 ln -f -s \${logfile} $TEST_SSHD_LOGFILE
 echo "Executing: ${SSHD} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE
 echo "Executing: ${SSHD} \$@" >>\${logfile}