Commit f457fb4a authored by Niels Möller's avatar Niels Möller
Browse files

(LSHD_PTY_HELPER, LSHD_UTMP)

(LSHD_WTMP): Define and export.
(run_lsh): Moved -nt flag before $LSH_FLAGS, so it can be
overridden.
(exec_lsh, exec_lshg): Removed -nt flag, as no tty is the default
behaviour.

Rev: src/testsuite/functions.sh:1.40.2.8
parent 7ffbdf2c
...@@ -12,11 +12,17 @@ set -e ...@@ -12,11 +12,17 @@ set -e
: ${SEXP_CONV:="`pwd`/../nettle/tools/sexp-conv"} : ${SEXP_CONV:="`pwd`/../nettle/tools/sexp-conv"}
: ${LSH_TRANSPORT:="`pwd`/../lsh-transport"} : ${LSH_TRANSPORT:="`pwd`/../lsh-transport"}
: ${LSHD_CONNECTION:="`pwd`/../lshd-connection"} : ${LSHD_CONNECTION:="`pwd`/../lshd-connection"}
: ${LSHD_PTY_HELPER:="`pwd`/../lshd-pty-helper"}
: ${LSHD_USERAUTH:="`pwd`/../lshd-userauth"} : ${LSHD_USERAUTH:="`pwd`/../lshd-userauth"}
: ${LSHD_UTMP:="`pwd`/home/utmpx"}
: ${LSHD_WTMP:="`pwd`/home/wtmpx"}
: ${LSHD_CONFIG_DIR:="$srcdir/config"} : ${LSHD_CONFIG_DIR:="$srcdir/config"}
export LSH_YARROW_SEED_FILE SEXP_CONV LSH_TRANSPORT LSHD_CONNECTION LSHD_USERAUTH LSHD_CONFIG_DIR export LSH_YARROW_SEED_FILE SEXP_CONV LSH_TRANSPORT
export LSHD_CONNECTION LSHD_PTY_HELPER LSHD_USERAUTH
export LSHD_UTMP LSHD_WTMP LSHD_CONFIG_DIR
: ${LSHD_FLAGS:=''} : ${LSHD_FLAGS:=''}
: ${LSH_FLAGS:=-q} : ${LSH_FLAGS:=-q}
...@@ -127,14 +133,14 @@ spawn_lshd () { ...@@ -127,14 +133,14 @@ spawn_lshd () {
run_lsh () { run_lsh () {
cmd="$1" cmd="$1"
shift shift
echo "$cmd" | HOME="$TEST_HOME" ../lsh $LSH_FLAGS -nt \ echo "$cmd" | HOME="$TEST_HOME" ../lsh -nt $LSH_FLAGS \
--no-use-gateway --sloppy-host-authentication \ --no-use-gateway --sloppy-host-authentication \
--capture-to /dev/null -p $PORT "$@" localhost --capture-to /dev/null -p $PORT "$@" localhost
} }
exec_lsh () { exec_lsh () {
HOME="$TEST_HOME" ../lsh $LSH_FLAGS -nt --sloppy-host-authentication \ HOME="$TEST_HOME" ../lsh $LSH_FLAGS --sloppy-host-authentication \
--no-use-gateway \ --no-use-gateway \
--capture-to /dev/null -z -p $PORT localhost "$@" --capture-to /dev/null -z -p $PORT localhost "$@"
} }
...@@ -150,7 +156,7 @@ spawn_lsh () { ...@@ -150,7 +156,7 @@ spawn_lsh () {
} }
exec_lshg () { exec_lshg () {
../lsh --use-gateway --program-name lshg $LSHG_FLAGS -nt -p $PORT localhost "$@" ../lsh --use-gateway --program-name lshg $LSHG_FLAGS -p $PORT localhost "$@"
} }
spawn_lshg () { spawn_lshg () {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment