diff options
author | Colin Watson <cjwatson@debian.org> | 2017-04-02 01:26:17 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-04-02 01:54:08 +0100 |
commit | 20adc7e0fc13ff9c7d270db250aac1fa140e3851 (patch) | |
tree | 5d9f06b0ff195db88093037d9102f0cdcf3884c6 /regress/test-exec.sh | |
parent | af27669f905133925224acc753067dea710881dd (diff) | |
parent | ec338656a3d6b21bb87f3b6367b232d297f601e5 (diff) |
New upstream release (7.5p1)
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 13a8e18f3..dc033cd96 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.58 2016/12/16 01:06:27 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.59 2017/02/07 23:03:11 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -317,14 +317,6 @@ stop_sshd () | |||
317 | fi | 317 | fi |
318 | } | 318 | } |
319 | 319 | ||
320 | TMP= | ||
321 | |||
322 | make_tmpdir () | ||
323 | { | ||
324 | TMP="$($OBJ/mkdtemp openssh-regress-XXXXXXXXXXXX)" || \ | ||
325 | fatal "failed to create temporary directory" | ||
326 | } | ||
327 | |||
328 | # helper | 320 | # helper |
329 | cleanup () | 321 | cleanup () |
330 | { | 322 | { |
@@ -335,9 +327,6 @@ cleanup () | |||
335 | kill $SSH_PID | 327 | kill $SSH_PID |
336 | fi | 328 | fi |
337 | fi | 329 | fi |
338 | if [ "x$TMP" != "x" ]; then | ||
339 | rm -rf "$TMP" | ||
340 | fi | ||
341 | stop_sshd | 330 | stop_sshd |
342 | } | 331 | } |
343 | 332 | ||
@@ -455,12 +444,10 @@ Host * | |||
455 | User $USER | 444 | User $USER |
456 | GlobalKnownHostsFile $OBJ/known_hosts | 445 | GlobalKnownHostsFile $OBJ/known_hosts |
457 | UserKnownHostsFile $OBJ/known_hosts | 446 | UserKnownHostsFile $OBJ/known_hosts |
458 | RSAAuthentication yes | ||
459 | PubkeyAuthentication yes | 447 | PubkeyAuthentication yes |
460 | ChallengeResponseAuthentication no | 448 | ChallengeResponseAuthentication no |
461 | HostbasedAuthentication no | 449 | HostbasedAuthentication no |
462 | PasswordAuthentication no | 450 | PasswordAuthentication no |
463 | RhostsRSAAuthentication no | ||
464 | BatchMode yes | 451 | BatchMode yes |
465 | StrictHostKeyChecking yes | 452 | StrictHostKeyChecking yes |
466 | LogLevel DEBUG3 | 453 | LogLevel DEBUG3 |