Deleted Added
sdiff udiff text old ( 180746 ) new ( 180750 )
full compact
1# $OpenBSD: test-exec.sh,v 1.31 2007/12/21 04:13:53 djm Exp $
2# Placed in the Public Domain.
3
4#SUDO=sudo
5
6# Unbreak GNU head(1)
7_POSIX2_VERSION=199209
8export _POSIX2_VERSION
9

--- 55 unchanged lines hidden (view full) ---

65SSHADD=ssh-add
66SSHKEYGEN=ssh-keygen
67SSHKEYSCAN=ssh-keyscan
68SFTP=sftp
69SFTPSERVER=/usr/libexec/openssh/sftp-server
70SCP=scp
71
72# Interop testing
73PLINK=/usr/local/bin/plink
74PUTTYGEN=/usr/local/bin/puttygen
75
76if [ "x$TEST_SSH_SSH" != "x" ]; then
77 SSH="${TEST_SSH_SSH}"
78fi
79if [ "x$TEST_SSH_SSHD" != "x" ]; then
80 SSHD="${TEST_SSH_SSHD}"
81fi
82if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then

--- 26 unchanged lines hidden (view full) ---

109fi
110if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
111 # Find real binary, if it exists
112 case "${TEST_SSH_PUTTYGEN}" in
113 /*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;;
114 *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;;
115 esac
116fi
117
118# Path to sshd must be absolute for rexec
119case "$SSHD" in
120/*) ;;
121*) SSHD=`which sshd` ;;
122esac
123
124if [ "x$TEST_SSH_LOGFILE" = "x" ]; then

--- 157 unchanged lines hidden (view full) ---

282 $SUDO cp $OBJ/$t $OBJ/host.$t
283 echo HostKey $OBJ/host.$t >> $OBJ/sshd_config
284
285 # don't use SUDO for proxy connect
286 echo HostKey $OBJ/$t >> $OBJ/sshd_proxy
287done
288chmod 644 $OBJ/authorized_keys_$USER
289
290# If PuTTY is present, prepare keys and configuration
291REGRESS_INTEROP_PUTTY=no
292if test -x "$PUTTYGEN" -a -x "$PLINK" ; then
293 mkdir -p ${OBJ}/.putty
294
295 # Add a PuTTY key to authorized_keys
296 rm -f ${OBJ}/putty.rsa2
297 puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null
298 puttygen -O public-openssh ${OBJ}/putty.rsa2 \
299 >> $OBJ/authorized_keys_$USER
300

--- 53 unchanged lines hidden ---