aboutsummaryrefslogtreecommitdiff
path: root/regress/key-options.sh
diff options
context:
space:
mode:
Diffstat (limited to 'regress/key-options.sh')
-rwxr-xr-xregress/key-options.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/regress/key-options.sh b/regress/key-options.sh
index d680737c168b..112c9bd8ec5c 100755
--- a/regress/key-options.sh
+++ b/regress/key-options.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: key-options.sh,v 1.8 2018/03/14 05:35:40 djm Exp $
+# $OpenBSD: key-options.sh,v 1.9 2018/07/03 13:53:26 djm Exp $
# Placed in the Public Domain.
tid="key options"
@@ -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`
@@ -63,6 +65,7 @@ expect_pty_fail "restrict" "restrict"
expect_pty_succeed "restrict,pty" "restrict,pty"
# Test environment=
+# XXX this can fail if ~/.ssh/environment exists for the user running the test
echo 'PermitUserEnvironment yes' >> $OBJ/sshd_proxy
sed 's/.*/environment="FOO=bar" &/' $origkeys >$authkeys
verbose "key option environment"