diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
commit | 78799892cb1858927be02be9737c594052e3f910 (patch) | |
tree | ac3dc2e848ab9dc62fe4252e01e52c3d456f628f /regress/reexec.sh | |
parent | 3875951bb76a9ec62634ae4026c9cc885d933477 (diff) | |
parent | 31e30b835fd9695d3b6647cab4867001b092e28f (diff) |
* New upstream release (http://www.openssh.com/txt/release-5.6):
- Added a ControlPersist option to ssh_config(5) that automatically
starts a background ssh(1) multiplex master when connecting. This
connection can stay alive indefinitely, or can be set to automatically
close after a user-specified duration of inactivity (closes: #335697,
#350898, #454787, #500573, #550262).
- Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
Match blocks (closes: #549858).
- sftp(1): fix ls in working directories that contain globbing
characters in their pathnames (LP: #530714).
Diffstat (limited to 'regress/reexec.sh')
-rw-r--r-- | regress/reexec.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/reexec.sh b/regress/reexec.sh index 4f824a31d..6edfc318e 100644 --- a/regress/reexec.sh +++ b/regress/reexec.sh | |||
@@ -41,7 +41,7 @@ echo "InvalidXXX=no" >> $OBJ/sshd_config | |||
41 | 41 | ||
42 | copy_tests | 42 | copy_tests |
43 | 43 | ||
44 | $SUDO kill `cat $PIDFILE` | 44 | $SUDO kill `$SUDO cat $PIDFILE` |
45 | rm -f $PIDFILE | 45 | rm -f $PIDFILE |
46 | 46 | ||
47 | cp $OBJ/sshd_config.orig $OBJ/sshd_config | 47 | cp $OBJ/sshd_config.orig $OBJ/sshd_config |
@@ -53,7 +53,7 @@ rm -f $SSHD_COPY | |||
53 | 53 | ||
54 | copy_tests | 54 | copy_tests |
55 | 55 | ||
56 | $SUDO kill `cat $PIDFILE` | 56 | $SUDO kill `$SUDO cat $PIDFILE` |
57 | rm -f $PIDFILE | 57 | rm -f $PIDFILE |
58 | 58 | ||
59 | verbose "test reexec fallback without privsep" | 59 | verbose "test reexec fallback without privsep" |
@@ -66,7 +66,7 @@ rm -f $SSHD_COPY | |||
66 | 66 | ||
67 | copy_tests | 67 | copy_tests |
68 | 68 | ||
69 | $SUDO kill `cat $PIDFILE` | 69 | $SUDO kill `$SUDO cat $PIDFILE` |
70 | rm -f $PIDFILE | 70 | rm -f $PIDFILE |
71 | 71 | ||
72 | 72 | ||