tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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@
This commit is contained in:
Damien Miller 2018-05-11 14:04:40 +10:00
parent b2140a739b
commit 54268d589e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
regress/key-options.sh
View File

@ -27,6 +27,7 @@ expect_pty_succeed() {
rm -f $OBJ/data rm -f $OBJ/data
sed "s/.*/$opts &/" $origkeys >$authkeys sed "s/.*/$opts &/" $origkeys >$authkeys
verbose "key option pty $which" verbose "key option pty $which"
config_defined HAVE_OPENPTY || verbose "skipped for no openpty(3)"
${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0"
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
fail "key option failed $which" fail "key option failed $which"
@ -44,6 +45,7 @@ expect_pty_fail() {
rm -f $OBJ/data rm -f $OBJ/data
sed "s/.*/$opts &/" $origkeys >$authkeys sed "s/.*/$opts &/" $origkeys >$authkeys
verbose "key option pty $which" verbose "key option pty $which"
config_defined HAVE_OPENPTY || verbose "skipped for no openpty(3)"
${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
r=`cat $OBJ/data` r=`cat $OBJ/data`