diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2023-10-31 04:15:40 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-10-31 15:35:53 +1100 |
| commit | fb06f9b5a065dfbbef5916fc4accc03c0bf026dd (patch) | |
| tree | bf254a4d4b7df44f537a0170d7619e8caf47a5de | |
| parent | fc3cc33e88c242c704781c6c48087838f1dcfa2a (diff) | |
| download | openssh-fb06f9b5a065dfbbef5916fc4accc03c0bf026dd.tar.gz | |
upstream: 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.
OpenBSD-Regress-ID: 70d58df7503db699de579a9479300e5f3735f4ee
| -rw-r--r-- | regress/test-exec.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index aae90f243..089ef73c4 100644 --- a/regress/test-exec.sh +++ b/regress/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 @@ -322,7 +322,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} |