diff options
author | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
commit | ea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch) | |
tree | d73ccdff78d8608e156465af42e6a1b3527fb2d6 /regress/test-exec.sh | |
parent | e39b311381a5609cc05acf298c42fba196dc524b (diff) | |
parent | f5bda272678ec6dccaa5f29379cf60cb855018e8 (diff) |
Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it
extensively yet.
ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index cc7ea67fe..98851dc97 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -30,7 +30,7 @@ if [ ! -f $SCRIPT ]; then | |||
30 | echo "not a file: $SCRIPT" | 30 | echo "not a file: $SCRIPT" |
31 | exit 2 | 31 | exit 2 |
32 | fi | 32 | fi |
33 | if sh -n $SCRIPT; then | 33 | if $TEST_SHELL -n $SCRIPT; then |
34 | true | 34 | true |
35 | else | 35 | else |
36 | echo "syntax error in $SCRIPT" | 36 | echo "syntax error in $SCRIPT" |
@@ -185,7 +185,6 @@ Host * | |||
185 | ChallengeResponseAuthentication no | 185 | ChallengeResponseAuthentication no |
186 | HostbasedAuthentication no | 186 | HostbasedAuthentication no |
187 | PasswordAuthentication no | 187 | PasswordAuthentication no |
188 | RhostsAuthentication no | ||
189 | RhostsRSAAuthentication no | 188 | RhostsRSAAuthentication no |
190 | BatchMode yes | 189 | BatchMode yes |
191 | StrictHostKeyChecking yes | 190 | StrictHostKeyChecking yes |