diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /regress/reexec.sh | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'regress/reexec.sh')
-rw-r--r-- | regress/reexec.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/regress/reexec.sh b/regress/reexec.sh index 2192456cd..8966ba524 100644 --- a/regress/reexec.sh +++ b/regress/reexec.sh | |||
@@ -9,7 +9,10 @@ SSHD_COPY=$OBJ/sshd | |||
9 | # Start a sshd and then delete it | 9 | # Start a sshd and then delete it |
10 | start_sshd_copy () | 10 | start_sshd_copy () |
11 | { | 11 | { |
12 | cp $SSHD_ORIG $SSHD_COPY | 12 | # NB. prefer ln to cp here. On some OSX 19.4 configurations, |
13 | # djm has seen failure after fork() when the executable image | ||
14 | # has been removed from the filesystem. | ||
15 | ln $SSHD_ORIG $SSHD_COPY || cp $SSHD_ORIG $SSHD_COPY | ||
13 | SSHD=$SSHD_COPY | 16 | SSHD=$SSHD_COPY |
14 | start_sshd | 17 | start_sshd |
15 | SSHD=$SSHD_ORIG | 18 | SSHD=$SSHD_ORIG |