upstream: Remove SUDO in proxy command wrapper. Anything that needs

sudo is already run by it, and it breaks if root isn't in sudoers.

OpenBSD-Regress-ID: 6cf22fda32a89c16915f31a6ed9bbdbef2a3bac9
This commit is contained in:
dtucker@openbsd.org 2023-03-02 11:10:27 +00:00 committed by Darren Tucker
parent 0d514659b2
commit 5fc60e8246
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.97 2023/03/02 08:24:41 dtucker Exp $
# $OpenBSD: test-exec.sh,v 1.98 2023/03/02 11:10:27 dtucker Exp $
# Placed in the Public Domain.
#SUDO=sudo
@ -301,8 +301,8 @@ logfile="${TEST_SSH_LOGDIR}/\${timestamp}.ssh.\$\$.log"
echo "Executing: ${SSH} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE
echo "Executing: ${SSH} \$@" >>\${logfile}
for i in "\$@";do shift;case "\$i" in -q):;; *) set -- "\$@" "\$i";;esac;done
$SUDO rm -f $TEST_SSH_LOGFILE
ln -s \${logfile} $TEST_SSH_LOGFILE
rm -f $TEST_SSH_LOGFILE
ln -f -s \${logfile} $TEST_SSH_LOGFILE
exec ${SSH} -E\${logfile} "\$@"
EOD
@ -316,8 +316,8 @@ cat >$SSHDLOGWRAP <<EOD
#!/bin/sh
timestamp="\`$OBJ/timestamp\`"
logfile="${TEST_SSH_LOGDIR}/\${timestamp}.sshd.\$\$.log"
$SUDO rm -f $TEST_SSHD_LOGFILE
ln -s \${logfile} $TEST_SSHD_LOGFILE
rm -f $TEST_SSHD_LOGFILE
ln -f -s \${logfile} $TEST_SSHD_LOGFILE
echo "Executing: ${SSHD} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE
echo "Executing: ${SSHD} \$@" >>\${logfile}
exec ${SSHD} -E\${logfile} "\$@"