summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regress/test-exec.sh23
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 @@
11 - djm@cvs.openbsd.org 2004/06/24 19:32:00 11 - djm@cvs.openbsd.org 2004/06/24 19:32:00
12 [regress/Makefile regress/test-exec.sh, added regress/reexec.sh] 12 [regress/Makefile regress/test-exec.sh, added regress/reexec.sh]
13 regress test for re-exec corner cases 13 regress test for re-exec corner cases
14 - djm@cvs.openbsd.org 2004/06/25 01:25:12
15 [regress/test-exec.sh]
16 clean reexec-specific junk out of text-exec.sh and simplify; idea markus@
14 17
1520040623 1820040623
16 - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1 19 - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
@@ -1413,4 +1416,4 @@
1413 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1416 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1414 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1417 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1415 1418
1416$Id: ChangeLog,v 1.3446 2004/06/25 03:45:18 dtucker Exp $ 1419$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 @@
1# $OpenBSD: test-exec.sh,v 1.22 2004/06/24 19:32:00 djm Exp $ 1# $OpenBSD: test-exec.sh,v 1.23 2004/06/25 01:25:12 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4#SUDO=sudo 4#SUDO=sudo
@@ -268,27 +268,6 @@ start_sshd ()
268 test -f $PIDFILE || fatal "no sshd running on port $PORT" 268 test -f $PIDFILE || fatal "no sshd running on port $PORT"
269} 269}
270 270
271# Start a sshd and then delete it
272start_sshd_copy_zap ()
273{
274 cp ${SSHD} $OBJ/sshd.copy
275 SSHD_CPY=`which $OBJ/sshd.copy`
276
277 # start sshd
278 $SUDO $SSHD_CPY -f $OBJ/sshd_config -t || fatal "sshd_config broken"
279 $SUDO $SSHD_CPY -f $OBJ/sshd_config
280
281 trace "wait for sshd"
282 i=0;
283 while [ ! -f $PIDFILE -a $i -lt 5 ]; do
284 i=`expr $i + 1`
285 sleep $i
286 done
287
288 test -f $PIDFILE || fatal "no sshd running on port $PORT"
289 rm -f $OBJ/sshd.copy
290}
291
292# source test body 271# source test body
293. $SCRIPT 272. $SCRIPT
294 273