diff options
Diffstat (limited to 'regress')
-rw-r--r-- | regress/key-options.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/regress/key-options.sh b/regress/key-options.sh index 112c9bd8e..097f46eba 100644 --- a/regress/key-options.sh +++ b/regress/key-options.sh | |||
@@ -7,6 +7,12 @@ origkeys="$OBJ/authkeys_orig" | |||
7 | authkeys="$OBJ/authorized_keys_${USER}" | 7 | authkeys="$OBJ/authorized_keys_${USER}" |
8 | cp $authkeys $origkeys | 8 | cp $authkeys $origkeys |
9 | 9 | ||
10 | # Allocating ptys can require privileges on some platforms. | ||
11 | skip_pty="" | ||
12 | if ! config_defined HAVE_OPENPTY && [ "x$SUDO" == "x" ]; then | ||
13 | skip_pty="no openpty(3) and SUDO not set" | ||
14 | fi | ||
15 | |||
10 | # Test command= forced command | 16 | # Test command= forced command |
11 | for c in 'command="echo bar"' 'no-pty,command="echo bar"'; do | 17 | for c in 'command="echo bar"' 'no-pty,command="echo bar"'; do |
12 | sed "s/.*/$c &/" $origkeys >$authkeys | 18 | sed "s/.*/$c &/" $origkeys >$authkeys |
@@ -27,7 +33,7 @@ expect_pty_succeed() { | |||
27 | rm -f $OBJ/data | 33 | rm -f $OBJ/data |
28 | sed "s/.*/$opts &/" $origkeys >$authkeys | 34 | sed "s/.*/$opts &/" $origkeys >$authkeys |
29 | verbose "key option pty $which" | 35 | verbose "key option pty $which" |
30 | config_defined HAVE_OPENPTY || verbose "skipped for no openpty(3)" | 36 | [ "x$skip_pty" != "x" ] && verbose "skipped because $skip_pty" && return |
31 | ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" | 37 | ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" |
32 | if [ $? -ne 0 ] ; then | 38 | if [ $? -ne 0 ] ; then |
33 | fail "key option failed $which" | 39 | fail "key option failed $which" |
@@ -45,7 +51,7 @@ expect_pty_fail() { | |||
45 | rm -f $OBJ/data | 51 | rm -f $OBJ/data |
46 | sed "s/.*/$opts &/" $origkeys >$authkeys | 52 | sed "s/.*/$opts &/" $origkeys >$authkeys |
47 | verbose "key option pty $which" | 53 | verbose "key option pty $which" |
48 | config_defined HAVE_OPENPTY || verbose "skipped for no openpty(3)" | 54 | [ "x$skip_pty" != "x" ] && verbose "skipped because $skip_pty" && return |
49 | ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" | 55 | ${SSH} -ttq -F $OBJ/ssh_proxy somehost "tty > $OBJ/data; exit 0" |
50 | if [ $? -eq 0 ]; then | 56 | if [ $? -eq 0 ]; then |
51 | r=`cat $OBJ/data` | 57 | r=`cat $OBJ/data` |