summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-12-06 23:00:27 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-12-06 23:00:27 +1100
commita372960fa9b7a6723910205bf8c05243076ff0ee (patch)
treef4cc4e6037e2c4933bbdcca80054251888e6801a
parentc0dc1c9bfa127516b8758c1ee1ba3cbd29359ad2 (diff)
- djm@cvs.openbsd.org 2004/06/26 06:16:07
[reexec.sh] don't change the name of the copied sshd for the reexec fallback test, makes life simpler for portable
-rw-r--r--ChangeLog7
-rw-r--r--regress/reexec.sh4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 513df22d..23831884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,11 @@
[auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h ssh.h sshd.8]
Discard over-length authorized_keys entries rather than complaining when
they don't decode. bz #884, with & ok djm@
+ - (dtucker) OpenBSD CVS Sync (regress/)
+ - djm@cvs.openbsd.org 2004/06/26 06:16:07
+ [reexec.sh]
+ don't change the name of the copied sshd for the reexec fallback test,
+ makes life simpler for portable
20041203
- (dtucker) OpenBSD CVS Sync
@@ -1894,4 +1899,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.3590 2004/12/06 11:47:41 dtucker Exp $
+$Id: ChangeLog,v 1.3591 2004/12/06 12:00:27 dtucker Exp $
diff --git a/regress/reexec.sh b/regress/reexec.sh
index 39fffefb..ce3dd86a 100644
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: reexec.sh,v 1.3 2004/06/25 01:32:44 djm Exp $
+# $OpenBSD: reexec.sh,v 1.4 2004/06/26 06:16:07 djm Exp $
# Placed in the Public Domain.
tid="reexec tests"
@@ -6,7 +6,7 @@ tid="reexec tests"
DATA=/bin/ls
COPY=${OBJ}/copy
SSHD_ORIG=$SSHD
-SSHD_COPY=$OBJ/sshd.copy
+SSHD_COPY=$OBJ/sshd
# Start a sshd and then delete it
start_sshd_copy_zap ()