diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /regress/test-exec.sh | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 4e53449be..4b3a70eb3 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -96,9 +96,10 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then | |||
96 | fi | 96 | fi |
97 | 97 | ||
98 | # Path to sshd must be absolute for rexec | 98 | # Path to sshd must be absolute for rexec |
99 | if [ ! -x /$SSHD ]; then | 99 | case "$SSHD" in |
100 | SSHD=`which sshd` | 100 | /*) ;; |
101 | fi | 101 | *) SSHD=`which sshd` ;; |
102 | esac | ||
102 | 103 | ||
103 | if [ "x$TEST_SSH_LOGFILE" = "x" ]; then | 104 | if [ "x$TEST_SSH_LOGFILE" = "x" ]; then |
104 | TEST_SSH_LOGFILE=/dev/null | 105 | TEST_SSH_LOGFILE=/dev/null |
@@ -197,7 +198,7 @@ cat << EOF > $OBJ/sshd_config | |||
197 | #ListenAddress ::1 | 198 | #ListenAddress ::1 |
198 | PidFile $PIDFILE | 199 | PidFile $PIDFILE |
199 | AuthorizedKeysFile $OBJ/authorized_keys_%u | 200 | AuthorizedKeysFile $OBJ/authorized_keys_%u |
200 | LogLevel DEBUG | 201 | LogLevel VERBOSE |
201 | AcceptEnv _XXX_TEST_* | 202 | AcceptEnv _XXX_TEST_* |
202 | AcceptEnv _XXX_TEST | 203 | AcceptEnv _XXX_TEST |
203 | Subsystem sftp $SFTPSERVER | 204 | Subsystem sftp $SFTPSERVER |