diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-12-06 23:00:27 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-12-06 23:00:27 +1100 |
commit | a372960fa9b7a6723910205bf8c05243076ff0ee (patch) | |
tree | f4cc4e6037e2c4933bbdcca80054251888e6801a | |
parent | c0dc1c9bfa127516b8758c1ee1ba3cbd29359ad2 (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-- | ChangeLog | 7 | ||||
-rw-r--r-- | regress/reexec.sh | 4 |
2 files changed, 8 insertions, 3 deletions
@@ -21,6 +21,11 @@ | |||
21 | [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h ssh.h sshd.8] | 21 | [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h ssh.h sshd.8] |
22 | Discard over-length authorized_keys entries rather than complaining when | 22 | Discard over-length authorized_keys entries rather than complaining when |
23 | they don't decode. bz #884, with & ok djm@ | 23 | they don't decode. bz #884, with & ok djm@ |
24 | - (dtucker) OpenBSD CVS Sync (regress/) | ||
25 | - djm@cvs.openbsd.org 2004/06/26 06:16:07 | ||
26 | [reexec.sh] | ||
27 | don't change the name of the copied sshd for the reexec fallback test, | ||
28 | makes life simpler for portable | ||
24 | 29 | ||
25 | 20041203 | 30 | 20041203 |
26 | - (dtucker) OpenBSD CVS Sync | 31 | - (dtucker) OpenBSD CVS Sync |
@@ -1894,4 +1899,4 @@ | |||
1894 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1899 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1895 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1900 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1896 | 1901 | ||
1897 | $Id: ChangeLog,v 1.3590 2004/12/06 11:47:41 dtucker Exp $ | 1902 | $Id: ChangeLog,v 1.3591 2004/12/06 12:00:27 dtucker Exp $ |
diff --git a/regress/reexec.sh b/regress/reexec.sh index 39fffefbc..ce3dd86a7 100644 --- a/regress/reexec.sh +++ b/regress/reexec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: reexec.sh,v 1.3 2004/06/25 01:32:44 djm Exp $ | 1 | # $OpenBSD: reexec.sh,v 1.4 2004/06/26 06:16:07 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="reexec tests" | 4 | tid="reexec tests" |
@@ -6,7 +6,7 @@ tid="reexec tests" | |||
6 | DATA=/bin/ls | 6 | DATA=/bin/ls |
7 | COPY=${OBJ}/copy | 7 | COPY=${OBJ}/copy |
8 | SSHD_ORIG=$SSHD | 8 | SSHD_ORIG=$SSHD |
9 | SSHD_COPY=$OBJ/sshd.copy | 9 | SSHD_COPY=$OBJ/sshd |
10 | 10 | ||
11 | # Start a sshd and then delete it | 11 | # Start a sshd and then delete it |
12 | start_sshd_copy_zap () | 12 | start_sshd_copy_zap () |