summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2004-06-25 01:32:45 +0000
committerDamien Miller <djm@cvs.openbsd.org>2004-06-25 01:32:45 +0000
commitb33b57311177d6c88770ae91701cc29b5773172f (patch)
tree64c1fc5ce94bbfb6b6d0704a1c3e807df17e6859
parent40e8ea64d4fccb8b3591660fe86a336734854766 (diff)
simplify
-rw-r--r--regress/usr.bin/ssh/reexec.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/regress/usr.bin/ssh/reexec.sh b/regress/usr.bin/ssh/reexec.sh
index f036ac7f303..39fffefbc35 100644
--- a/regress/usr.bin/ssh/reexec.sh
+++ b/regress/usr.bin/ssh/reexec.sh
@@ -1,19 +1,20 @@
-# $OpenBSD: reexec.sh,v 1.2 2004/06/25 01:25:11 djm Exp $
+# $OpenBSD: reexec.sh,v 1.3 2004/06/25 01:32:44 djm Exp $
# Placed in the Public Domain.
tid="reexec tests"
DATA=/bin/ls
COPY=${OBJ}/copy
+SSHD_ORIG=$SSHD
+SSHD_COPY=$OBJ/sshd.copy
# Start a sshd and then delete it
start_sshd_copy_zap ()
{
- cp ${SSHD} $OBJ/sshd.copy
- SSHD_ORIG=$SSHD
- SSHD=`which $OBJ/sshd.copy`
+ cp $SSHD_ORIG $SSHD_COPY
+ SSHD=$SSHD_COPY
start_sshd
- rm -f $SSHD
+ rm -f $SSHD_COPY
SSHD=$SSHD_ORIG
}