diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /regress/test-exec.sh | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
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 |