From efd78a4357d2c1090cde5e42fffd01489609f7ab Mon Sep 17 00:00:00 2001
From: dtucker <dtucker@openbsd.org>
Date: Sun, 8 Aug 2021 07:27:52 +0000
Subject: [PATCH] Move setting of USER further down the startup   In portable
 we have to change this and having it in the same hunk as the CVS Id string
 means applying changes fails every. single. time.

---
 regress/usr.bin/ssh/test-exec.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index a0144bc0b06..131f7d6a13e 100644
--- a/regress/usr.bin/ssh/test-exec.sh
+++ b/regress/usr.bin/ssh/test-exec.sh
@@ -1,7 +1,6 @@
-#	$OpenBSD: test-exec.sh,v 1.84 2021/08/08 06:38:33 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.85 2021/08/08 07:27:52 dtucker Exp $
 #	Placed in the Public Domain.
 
-USER=`id -un`
 #SUDO=sudo
 
 if [ ! -x "$TEST_SSH_ELAPSED_TIMES" ]; then
@@ -40,6 +39,8 @@ else
 fi
 unset SSH_AUTH_SOCK
 
+USER=`id -un`
+
 SRC=`dirname ${SCRIPT}`
 
 # defaults
-- 
2.20.1