]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Only try to chown logfiles that exist to prevent spurious
authordtucker@openbsd.org <dtucker@openbsd.org>
Sun, 29 Oct 2023 06:22:07 +0000 (06:22 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sun, 29 Oct 2023 06:33:18 +0000 (17:33 +1100)
errors.

OpenBSD-Regress-ID: f1b20a476734e885078c481f1324c9ea03af991e

regress/test-exec.sh

index 928aaf2f56ef10c617429cafd12adb857ccdd9b5..5b2f2938a92ec94d2527d36530ab7d71d2e996f5 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.101 2023/10/20 07:37:07 dtucker Exp $
+#      $OpenBSD: test-exec.sh,v 1.102 2023/10/29 06:22:07 dtucker Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -502,10 +502,12 @@ save_debug_log ()
        testname=`echo $tid | tr ' ' _`
        tarname="$OBJ/failed-$testname-logs.tar"
 
-       if [ ! -z "$SUDO" ] ; then
-               $SUDO chown -R $USER $TEST_SSH_LOGDIR $TEST_REGRESS_LOGFILE \
-                   $TEST_SSH_LOGFILE $TEST_SSHD_LOGFILE
-       fi
+       for logfile in $TEST_SSH_LOGDIR $TEST_REGRESS_LOGFILE \
+           $TEST_SSH_LOGFILE $TEST_SSHD_LOGFILE; do
+               if [ ! -z "$SUDO" ] && [ -f "$logfile" ]; then
+                       $SUDO chown -R $USER $logfile
+               fi
+       done
        echo $@ >>$TEST_REGRESS_LOGFILE
        echo $@ >>$TEST_SSH_LOGFILE
        echo $@ >>$TEST_SSHD_LOGFILE