diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:46:28 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:46:28 +0100 |
commit | efd3d4522636ae029488c2e9730b60c88e257d2e (patch) | |
tree | 31e02ac3f16090ce8c53448677356b2b7f423683 /regress/test-exec.sh | |
parent | bbec4db36d464ea1d464a707625125f9fd5c7b5e (diff) | |
parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) |
* New upstream release (LP: #535029).
- After a transition period of about 10 years, this release disables SSH
protocol 1 by default. Clients and servers that need to use the
legacy protocol must explicitly enable it in ssh_config / sshd_config
or on the command-line.
- Remove the libsectok/OpenSC-based smartcard code and add support for
PKCS#11 tokens. This support is enabled by default in the Debian
packaging, since it now doesn't involve additional library
dependencies (closes: #231472, LP: #16918).
- Add support for certificate authentication of users and hosts using a
new, minimal OpenSSH certificate format (closes: #482806).
- Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
- Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
package, this overlaps with the key blacklisting facility added in
openssh 1:4.7p1-9, but with different file formats and slightly
different scopes; for the moment, I've roughly merged the two.)
- Various multiplexing improvements, including support for requesting
port-forwardings via the multiplex protocol (closes: #360151).
- Allow setting an explicit umask on the sftp-server(8) commandline to
override whatever default the user has (closes: #496843).
- Many sftp client improvements, including tab-completion, more options,
and recursive transfer support for get/put (LP: #33378). The old
mget/mput commands never worked properly and have been removed
(closes: #270399, #428082).
- Do not prompt for a passphrase if we fail to open a keyfile, and log
the reason why the open failed to debug (closes: #431538).
- Prevent sftp from crashing when given a "-" without a command. Also,
allow whitespace to follow a "-" (closes: #531561).
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index b54448912..b3a19389d 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.37 2010/02/24 06:21:56 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -172,9 +172,17 @@ cleanup () | |||
172 | echo no sshd running | 172 | echo no sshd running |
173 | else | 173 | else |
174 | if [ $pid -lt 2 ]; then | 174 | if [ $pid -lt 2 ]; then |
175 | echo bad pid for ssd: $pid | 175 | echo bad pid for ssh: $pid |
176 | else | 176 | else |
177 | $SUDO kill $pid | 177 | $SUDO kill $pid |
178 | trace "wait for sshd to exit" | ||
179 | i=0; | ||
180 | while [ -f $PIDFILE -a $i -lt 5 ]; do | ||
181 | i=`expr $i + 1` | ||
182 | sleep $i | ||
183 | done | ||
184 | test -f $PIDFILE && \ | ||
185 | fatal "sshd didn't exit port $PORT pid $pid" | ||
178 | fi | 186 | fi |
179 | fi | 187 | fi |
180 | fi | 188 | fi |
@@ -222,6 +230,7 @@ trap fatal 3 2 | |||
222 | cat << EOF > $OBJ/sshd_config | 230 | cat << EOF > $OBJ/sshd_config |
223 | StrictModes no | 231 | StrictModes no |
224 | Port $PORT | 232 | Port $PORT |
233 | Protocol 2,1 | ||
225 | AddressFamily inet | 234 | AddressFamily inet |
226 | ListenAddress 127.0.0.1 | 235 | ListenAddress 127.0.0.1 |
227 | #ListenAddress ::1 | 236 | #ListenAddress ::1 |
@@ -247,6 +256,7 @@ echo 'StrictModes no' >> $OBJ/sshd_proxy | |||
247 | # create client config | 256 | # create client config |
248 | cat << EOF > $OBJ/ssh_config | 257 | cat << EOF > $OBJ/ssh_config |
249 | Host * | 258 | Host * |
259 | Protocol 2,1 | ||
250 | Hostname 127.0.0.1 | 260 | Hostname 127.0.0.1 |
251 | HostKeyAlias localhost-with-alias | 261 | HostKeyAlias localhost-with-alias |
252 | Port $PORT | 262 | Port $PORT |