upstream: Remove sshd logfile in start_sshd

... and ssh and sshd log wrappers before recreating them.  Prevents "can't
create" errors during tests when running tests without SUDO after having
run them with SUDO.

OpenBSD-Regress-ID: 2f0a83532e3dccd673a9bf0291090277268c69a6

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 7a078edf6133282f8b80cc14264670003509ccfd..307f002e60a12f8f3ddefaabbe2a7fb8ac42e669 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.120 2024/10/14 03:02:08 djm Exp $
+#      $OpenBSD: test-exec.sh,v 1.121 2024/10/22 07:13:28 dtucker Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -309,6 +309,7 @@ fi
 # to preserve our debug logging.  In the rare instance where -q is desirable
 # -qq is equivalent and is not removed.
 SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh
+rm -f ${SSHLOGWRAP}
 cat >$SSHLOGWRAP <<EOD
 #!/bin/sh
 timestamp="\`$OBJ/timestamp\`"
@@ -327,6 +328,7 @@ REAL_SSHD="$SSHD"
 SSH="$SSHLOGWRAP"
 
 SSHDLOGWRAP=$OBJ/sshd-log-wrapper.sh
+rm -f ${SSHDLOGWRAP}
 cat >$SSHDLOGWRAP <<EOD
 #!/bin/sh
 timestamp="\`$OBJ/timestamp\`"
@@ -903,6 +905,7 @@ start_sshd ()
                i=`expr $i + 1`
                sleep $i
        done
+       rm -f ${TEST_SSHD_LOGFILE}
        ln -f -s ${logfile} $TEST_SSHD_LOGFILE
 
        test -f $PIDFILE || fatal "no sshd running on port $PORT"