diff options
author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
tree | f64a4ace625514e94759878c0b94ab0a79805bbd /regress/test-exec.sh | |
parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 4b3a70eb3..59ae33c08 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.27 2005/02/27 11:33:30 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.28 2005/05/20 23:14:15 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -24,6 +24,8 @@ if [ -x /usr/ucb/whoami ]; then | |||
24 | USER=`/usr/ucb/whoami` | 24 | USER=`/usr/ucb/whoami` |
25 | elif whoami >/dev/null 2>&1; then | 25 | elif whoami >/dev/null 2>&1; then |
26 | USER=`whoami` | 26 | USER=`whoami` |
27 | elif logname >/dev/null 2>&1; then | ||
28 | USER=`logname` | ||
27 | else | 29 | else |
28 | USER=`id -un` | 30 | USER=`id -un` |
29 | fi | 31 | fi |
@@ -194,6 +196,7 @@ trap fatal 3 2 | |||
194 | cat << EOF > $OBJ/sshd_config | 196 | cat << EOF > $OBJ/sshd_config |
195 | StrictModes no | 197 | StrictModes no |
196 | Port $PORT | 198 | Port $PORT |
199 | AddressFamily inet | ||
197 | ListenAddress 127.0.0.1 | 200 | ListenAddress 127.0.0.1 |
198 | #ListenAddress ::1 | 201 | #ListenAddress ::1 |
199 | PidFile $PIDFILE | 202 | PidFile $PIDFILE |
@@ -244,7 +247,7 @@ trace "generate keys" | |||
244 | for t in rsa rsa1; do | 247 | for t in rsa rsa1; do |
245 | # generate user key | 248 | # generate user key |
246 | rm -f $OBJ/$t | 249 | rm -f $OBJ/$t |
247 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ | 250 | ${SSHKEYGEN} -b 1024 -q -N '' -t $t -f $OBJ/$t ||\ |
248 | fail "ssh-keygen for $t failed" | 251 | fail "ssh-keygen for $t failed" |
249 | 252 | ||
250 | # known hosts file for client | 253 | # known hosts file for client |