The man2html from jbasney on pkilab2 works whereas the standard one doesn't.

[gssapi-openssh.git] / openssh / regress / test-exec.sh

diff --git a/openssh/regress/test-exec.sh b/openssh/regress/test-exec.sh
index bd0c025ba2b11ef716b565484728e2f9445cb304..a7a8ddbe606f0bc24f45792433829abc7e523eca 100644 (file)
--- a/openssh/regress/test-exec.sh
+++ b/openssh/regress/test-exec.sh
@@ -1,33 +1,11 @@
-#      $OpenBSD: test-exec.sh,v 1.27 2005/02/27 11:33:30 dtucker Exp $
+#      $OpenBSD: test-exec.sh,v 1.14 2002/04/15 15:19:48 markus Exp $
 #      Placed in the Public Domain.
 
+PORT=4242
+USER=`id -un`
+SUDO=
 #SUDO=sudo
 
-# Unbreak GNU head(1)
-_POSIX2_VERSION=199209
-export _POSIX2_VERSION
-
-case `uname -s 2>/dev/null` in
-OSF1*)
-       BIN_SH=xpg4
-       export BIN_SH
-       ;;
-esac
-
-if [ ! -z "$TEST_SSH_PORT" ]; then
-       PORT="$TEST_SSH_PORT"
-else
-       PORT=4242
-fi
-
-if [ -x /usr/ucb/whoami ]; then
-       USER=`/usr/ucb/whoami`
-elif whoami >/dev/null 2>&1; then
-       USER=`whoami`
-else
-       USER=`id -un`
-fi
-
 OBJ=$1
 if [ "x$OBJ" = "x" ]; then
        echo '$OBJ not defined'
@@ -46,7 +24,7 @@ if [ ! -f $SCRIPT ]; then
        echo "not a file: $SCRIPT"
        exit 2
 fi
-if $TEST_SHELL -n $SCRIPT; then
+if sh -n $SCRIPT; then
        true
 else
        echo "syntax error in $SCRIPT"
@@ -54,8 +32,6 @@ else
 fi
 unset SSH_AUTH_SOCK
 
-SRC=`dirname ${SCRIPT}`
-
 # defaults
 SSH=ssh
 SSHD=sshd
@@ -65,76 +41,37 @@ SSHKEYGEN=ssh-keygen
 SSHKEYSCAN=ssh-keyscan
 SFTP=sftp
 SFTPSERVER=/usr/libexec/openssh/sftp-server
-SCP=scp
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
-       SSH="${TEST_SSH_SSH}"
+       SSH=${TEST_SSH_SSH}
 fi
 if [ "x$TEST_SSH_SSHD" != "x" ]; then
-       SSHD="${TEST_SSH_SSHD}"
+       SSHD=${TEST_SSH_SSHD}
 fi
 if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then
-       SSHAGENT="${TEST_SSH_SSHAGENT}"
+       SSHAGENT=${TEST_SSH_SSHAGENT}
 fi
 if [ "x$TEST_SSH_SSHADD" != "x" ]; then
-       SSHADD="${TEST_SSH_SSHADD}"
+       SSHADD=${TEST_SSH_SSHADD}
 fi
 if [ "x$TEST_SSH_SSHKEYGEN" != "x" ]; then
-       SSHKEYGEN="${TEST_SSH_SSHKEYGEN}"
+       SSHKEYGEN=${TEST_SSH_SSHKEYGEN}
 fi
 if [ "x$TEST_SSH_SSHKEYSCAN" != "x" ]; then
-       SSHKEYSCAN="${TEST_SSH_SSHKEYSCAN}"
+       SSHKEYSCAN=${TEST_SSH_SSHKEYSCAN}
 fi
 if [ "x$TEST_SSH_SFTP" != "x" ]; then
-       SFTP="${TEST_SSH_SFTP}"
+       SFTP=${TEST_SSH_SFTP}
 fi
 if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then
-       SFTPSERVER="${TEST_SSH_SFTPSERVER}"
-fi
-if [ "x$TEST_SSH_SCP" != "x" ]; then
-       SCP="${TEST_SSH_SCP}"
-fi
-
-# Path to sshd must be absolute for rexec
-if [ ! -x /$SSHD ]; then
-       SSHD=`which sshd`
-fi
-
-if [ "x$TEST_SSH_LOGFILE" = "x" ]; then
-       TEST_SSH_LOGFILE=/dev/null
+       SFTPSERVER=${TEST_SSH_SFTPSERVER}
 fi
 
 # these should be used in tests
-export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
-#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
+export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER
+#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER
 
 # helper
-echon()
-{
-       if [ "x`echo -n`" = "x" ]; then
-               echo -n "$@"
-       elif [ "x`echo '\c'`" = "x" ]; then
-               echo "$@\c"
-       else
-               fatal "Don't know how to echo without newline."
-       fi
-}
-
-have_prog()
-{
-       saved_IFS="$IFS"
-       IFS=":"
-       for i in $PATH
-       do
-               if [ -x $i/$1 ]; then
-                       IFS="$saved_IFS"
-                       return 0
-               fi
-       done
-       IFS="$saved_IFS"
-       return 1
-}
-
 cleanup ()
 {
        if [ -f $PIDFILE ]; then
@@ -153,7 +90,6 @@ cleanup ()
 
 trace ()
 {
-       echo "trace: $@" >>$TEST_SSH_LOGFILE
        if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then
                echo "$@"
        fi
@@ -161,7 +97,6 @@ trace ()
 
 verbose ()
 {
-       echo "verbose: $@" >>$TEST_SSH_LOGFILE
        if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then
                echo "$@"
        fi
@@ -170,15 +105,13 @@ verbose ()
 
 fail ()
 {
-       echo "FAIL: $@" >>$TEST_SSH_LOGFILE
        RESULT=1
        echo "$@"
 }
 
 fatal ()
 {
-       echo "FATAL: $@" >>$TEST_SSH_LOGFILE
-       echon "FATAL: "
+       echo -n "FATAL: "
        fail "$@"
        cleanup
        exit $RESULT
@@ -191,23 +124,14 @@ trap fatal 3 2
 
 # create server config
 cat << EOF > $OBJ/sshd_config
-       StrictModes             no
        Port                    $PORT
        ListenAddress           127.0.0.1
        #ListenAddress          ::1
        PidFile                 $PIDFILE
        AuthorizedKeysFile      $OBJ/authorized_keys_%u
-       LogLevel                VERBOSE
-       AcceptEnv               _XXX_TEST_*
-       AcceptEnv               _XXX_TEST
-       Subsystem       sftp    $SFTPSERVER
+       LogLevel                QUIET
 EOF
 
-if [ ! -z "$TEST_SSH_SSHD_CONFOPTS" ]; then
-       trace "adding sshd_config option $TEST_SSH_SSHD_CONFOPTS"
-       echo "$TEST_SSH_SSHD_CONFOPTS" >> $OBJ/sshd_config
-fi
-
 # server config for proxy connects
 cp $OBJ/sshd_config $OBJ/sshd_proxy
 
@@ -228,15 +152,12 @@ Host *
        ChallengeResponseAuthentication no
        HostbasedAuthentication no
        PasswordAuthentication  no
+       RhostsAuthentication    no
+       RhostsRSAAuthentication no
        BatchMode               yes
        StrictHostKeyChecking   yes
 EOF
 
-if [ ! -z "$TEST_SSH_SSH_CONFOPTS" ]; then
-       trace "adding ssh_config option $TEST_SSH_SSHD_CONFOPTS"
-       echo "$TEST_SSH_SSH_CONFOPTS" >> $OBJ/ssh_config
-fi
-
 rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER
 
 trace "generate keys"
@@ -248,7 +169,7 @@ for t in rsa rsa1; do
 
        # known hosts file for client
        (
-               echon 'localhost-with-alias,127.0.0.1,::1 '
+               echo -n 'localhost-with-alias,127.0.0.1,::1 '
                cat $OBJ/$t.pub
        ) >> $OBJ/known_hosts
 
@@ -268,7 +189,7 @@ chmod 644 $OBJ/authorized_keys_$USER
 # create a proxy version of the client config
 (
        cat $OBJ/ssh_config
-       echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy
+       echo proxycommand ${SSHD} -i -f $OBJ/sshd_proxy
 ) > $OBJ/ssh_proxy
 
 # check proxy config
@@ -278,11 +199,11 @@ start_sshd ()
 {
        # start sshd
        $SUDO ${SSHD} -f $OBJ/sshd_config -t    || fatal "sshd_config broken"
-       $SUDO ${SSHD} -f $OBJ/sshd_config -e >>$TEST_SSH_LOGFILE 2>&1
+       $SUDO ${SSHD} -f $OBJ/sshd_config
 
        trace "wait for sshd"
        i=0;
-       while [ ! -f $PIDFILE -a $i -lt 10 ]; do
+       while [ ! -f $PIDFILE -a $i -lt 5 ]; do
                i=`expr $i + 1`
                sleep $i
        done