2 files changed, 5 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index ce4c6b3fa..e6903097c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
    - djm@cvs.openbsd.org 2004/06/24 19:32:00
      [regress/Makefile regress/test-exec.sh, added regress/reexec.sh]
      regress test for re-exec corner cases
+   - djm@cvs.openbsd.org 2004/06/25 01:25:12
+     [regress/test-exec.sh]
+     clean reexec-specific junk out of text-exec.sh and simplify; idea markus@
 
 20040623
  - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
@@ -1413,4 +1416,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3446 2004/06/25 03:45:18 dtucker Exp $
+$Id: ChangeLog,v 1.3447 2004/06/25 03:46:08 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e626dd78a..70250acd7 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.22 2004/06/24 19:32:00 djm Exp $
+#       $OpenBSD: test-exec.sh,v 1.23 2004/06/25 01:25:12 djm Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -268,27 +268,6 @@ start_sshd ()
         test -f $PIDFILE || fatal "no sshd running on port $PORT"
 }
 
-# Start a sshd and then delete it
-start_sshd_copy_zap ()
-{
-        cp ${SSHD} $OBJ/sshd.copy
-        SSHD_CPY=`which $OBJ/sshd.copy`
-
-        # start sshd
-        $SUDO $SSHD_CPY -f $OBJ/sshd_config -t  || fatal "sshd_config broken"
-        $SUDO $SSHD_CPY -f $OBJ/sshd_config
-
-        trace "wait for sshd"
-        i=0;
-        while [ ! -f $PIDFILE -a $i -lt 5 ]; do
-                i=`expr $i + 1`
-                sleep $i
-        done
-
-        test -f $PIDFILE || fatal "no sshd running on port $PORT"
-        rm -f $OBJ/sshd.copy
-}
-
 # source test body
 . $SCRIPT