]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Only try to chmod logfile if we have sudo. If we don't have
authordtucker@openbsd.org <dtucker@openbsd.org>
Tue, 31 Oct 2023 02:58:45 +0000 (02:58 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Tue, 31 Oct 2023 03:01:25 +0000 (14:01 +1100)
sudo then we won't need to chmod.

OpenBSD-Regress-ID: dbad2f5ece839658ef8af3376cb1fb1cabe2e324

regress/test-exec.sh

index bf4eeac3c154d5622acb305676a5e39c5f9ef7d4..aae90f2430abac4e6cef4e6826fbd762a5f81f43 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.103 2023/10/30 23:00:25 djm Exp $
+#      $OpenBSD: test-exec.sh,v 1.104 2023/10/31 02:58:45 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
-chown $USER \$logfile
+test -z "$SUDO" || "$SUDO" chown $USER \$logfile
 ln -f -s \${logfile} $TEST_SSHD_LOGFILE
 echo "Executing: ${SSHD} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE
 echo "Executing: ${SSHD} \$@" >>\${logfile}