From: Damien Miller <djm@mindrot.org>
Date: Fri, 11 May 2018 04:04:40 +0000 (+1000)
Subject: fix key-options.sh on platforms without openpty(3)
X-Git-Tag: V_7_8_P1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54268d589e85ecc43d3eba8d83f327bdada9d696;p=thirdparty%2Fopenssh-portable.git

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@
---

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() {
 	rm -f $OBJ/data
 	sed "s/.*/$opts &/" $origkeys >$authkeys
 	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"
 	if [ $? -ne 0 ] ; then
 		fail "key option failed $which"
@@ -44,6 +45,7 @@ expect_pty_fail() {
 	rm -f $OBJ/data
 	sed "s/.*/$opts &/" $origkeys >$authkeys
 	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"
 	if [ $? -eq 0 ]; then
 		r=`cat $OBJ/data`