diff options
author | Damien Miller <djm@mindrot.org> | 2018-05-11 14:04:40 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-05-11 14:04:40 +1000 |
commit | 54268d589e85ecc43d3eba8d83f327bdada9d696 (patch) | |
tree | 021a754746f4ea61dacc50e29930e1aaf6a492df | |
parent | b2140a739be4c3b43cc1dc08322dca39a1e39d20 (diff) |
fix key-options.sh on platforms without openpty(3)
Skip the pty tests if the platform lacks openpty(3) and has to chown(2)
the pty device explicitly. This typically requires root permissions that
this test lacks.
bz#2856 ok dtucker@
-rw-r--r-- | regress/key-options.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/regress/key-options.sh b/regress/key-options.sh index d680737c1..78d1adc77 100644 --- a/regress/key-options.sh +++ b/regress/key-options.sh | |||
@@ -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` |