upstream: Log command invocation while debugging.

This will aid in manually reproducing failing commands.

OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a

diff --git a/regress/sshd-log-wrapper.sh b/regress/sshd-log-wrapper.sh
index 29dc44aa0b53d7e57d21553088c7ff5bf3cf5b1f..4b3c91137990f80675d55a483c358c500dff95e2 100644 (file)
--- a/regress/sshd-log-wrapper.sh
+++ b/regress/sshd-log-wrapper.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#       $OpenBSD: sshd-log-wrapper.sh,v 1.4 2016/11/25 02:56:49 dtucker Exp $
+#       $OpenBSD: sshd-log-wrapper.sh,v 1.5 2022/01/04 08:38:53 dtucker Exp $
 #       Placed in the Public Domain.
 #
 # simple wrapper for sshd proxy mode to catch stderr output
@@ -8,4 +8,5 @@
 log=$1
 shift
 
+echo "Executing: $@" >>$log
 exec "$@" -E$log

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 415422ef5573bcfd674722c1c2bdc9f886567ccf..71204a5d7f678a377f0a1021413f3672e2dd9537 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.87 2021/09/01 00:50:27 dtucker Exp $
+#      $OpenBSD: test-exec.sh,v 1.88 2022/01/04 08:38:53 dtucker Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -262,6 +262,7 @@ fi
 SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh
 cat >$SSHLOGWRAP <<EOD
 #!/bin/sh
+echo "Executing: ${SSH} \$@" >>${TEST_SSH_LOGFILE}
 for i in "\$@";do shift;case "\$i" in -q):;; *) set -- "\$@" "\$i";;esac;done
 exec ${SSH} -E${TEST_SSH_LOGFILE} "\$@"
 EOD