diff options
Diffstat (limited to 'regress/key-options.sh')
-rw-r--r-- | regress/key-options.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/regress/key-options.sh b/regress/key-options.sh index d680737c1..112c9bd8e 100644 --- a/regress/key-options.sh +++ b/regress/key-options.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: key-options.sh,v 1.8 2018/03/14 05:35:40 djm Exp $ | 1 | # $OpenBSD: key-options.sh,v 1.9 2018/07/03 13:53:26 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="key options" | 4 | tid="key options" |
@@ -27,6 +27,7 @@ expect_pty_succeed() { | |||
27 | rm -f $OBJ/data | 27 | rm -f $OBJ/data |
28 | sed "s/.*/$opts &/" $origkeys >$authkeys | 28 | sed "s/.*/$opts &/" $origkeys >$authkeys |
29 | verbose "key option pty $which" | 29 | verbose "key option pty $which" |
30 | config_defined HAVE_OPENPTY || verbose "skipped for no openpty(3)" | ||
30 | ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" | 31 | ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" |
31 | if [ $? -ne 0 ] ; then | 32 | if [ $? -ne 0 ] ; then |
32 | fail "key option failed $which" | 33 | fail "key option failed $which" |
@@ -44,6 +45,7 @@ expect_pty_fail() { | |||
44 | rm -f $OBJ/data | 45 | rm -f $OBJ/data |
45 | sed "s/.*/$opts &/" $origkeys >$authkeys | 46 | sed "s/.*/$opts &/" $origkeys >$authkeys |
46 | verbose "key option pty $which" | 47 | verbose "key option pty $which" |
48 | config_defined HAVE_OPENPTY || verbose "skipped for no openpty(3)" | ||
47 | ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" | 49 | ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" |
48 | if [ $? -eq 0 ]; then | 50 | if [ $? -eq 0 ]; then |
49 | r=`cat $OBJ/data` | 51 | r=`cat $OBJ/data` |
@@ -63,6 +65,7 @@ expect_pty_fail "restrict" "restrict" | |||
63 | expect_pty_succeed "restrict,pty" "restrict,pty" | 65 | expect_pty_succeed "restrict,pty" "restrict,pty" |
64 | 66 | ||
65 | # Test environment= | 67 | # Test environment= |
68 | # XXX this can fail if ~/.ssh/environment exists for the user running the test | ||
66 | echo 'PermitUserEnvironment yes' >> $OBJ/sshd_proxy | 69 | echo 'PermitUserEnvironment yes' >> $OBJ/sshd_proxy |
67 | sed 's/.*/environment="FOO=bar" &/' $origkeys >$authkeys | 70 | sed 's/.*/environment="FOO=bar" &/' $origkeys >$authkeys |
68 | verbose "key option environment" | 71 | verbose "key option environment" |