diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2015-02-21 20:51:03 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2015-02-21 20:51:03 +0000 |
| commit | b134c8de00d1946aed2178a38089184bb1ad85b1 (patch) | |
| tree | f03543d52a9335d18103cd65b2dc859345cba424 /regress | |
| parent | fe0365edb2f9ac343620420344ad124194540a00 (diff) | |
correct paths to configuration files being written/updated;
they live in $OBJ not cwd; some by Roumen Petrov
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/ssh/forwarding.sh | 6 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/hostkey-agent.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/regress/usr.bin/ssh/forwarding.sh b/regress/usr.bin/ssh/forwarding.sh index 12307e50ba9..07441318cf8 100644 --- a/regress/usr.bin/ssh/forwarding.sh +++ b/regress/usr.bin/ssh/forwarding.sh @@ -1,4 +1,4 @@ -# $OpenBSD: forwarding.sh,v 1.12 2014/07/15 15:54:15 millert Exp $ +# $OpenBSD: forwarding.sh,v 1.13 2015/02/21 20:51:02 djm Exp $ # Placed in the Public Domain. tid="local and remote forwarding" @@ -103,8 +103,8 @@ for p in 2; do fi done -echo "LocalForward ${base}01 127.0.0.1:$PORT" >> ssh_config -echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> ssh_config +echo "LocalForward ${base}01 127.0.0.1:$PORT" >> $OBJ/ssh_config +echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> $OBJ/ssh_config for p in 1 2; do trace "config file: start forwarding, fork to background" ${SSH} -$p -F $OBJ/ssh_config -f somehost sleep 10 diff --git a/regress/usr.bin/ssh/hostkey-agent.sh b/regress/usr.bin/ssh/hostkey-agent.sh index c007d7a5ea3..a011ec83107 100644 --- a/regress/usr.bin/ssh/hostkey-agent.sh +++ b/regress/usr.bin/ssh/hostkey-agent.sh @@ -1,4 +1,4 @@ -# $OpenBSD: hostkey-agent.sh,v 1.4 2015/01/27 12:01:36 djm Exp $ +# $OpenBSD: hostkey-agent.sh,v 1.5 2015/02/21 20:51:02 djm Exp $ # Placed in the Public Domain. tid="hostkey agent" @@ -22,7 +22,7 @@ for k in `${SSH} -Q key-plain` ; do ) >> $OBJ/known_hosts.orig ${SSHADD} $OBJ/agent-key.$k >/dev/null 2>&1 || \ fatal "couldn't load key $OBJ/agent-key.$k" - echo "Hostkey $OBJ/agent-key.${k}" >> sshd_proxy.orig + echo "Hostkey $OBJ/agent-key.${k}" >> $OBJ/sshd_proxy.orig # Remove private key so the server can't use it. rm $OBJ/agent-key.$k || fatal "couldn't rm $OBJ/agent-key.$k" done |