summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-02-21 20:51:02 +0000
committerDamien Miller <djm@mindrot.org>2015-02-22 07:58:24 +1100
commit1a779a0dd6cd8b4a1a40ea33b5415ab8408128ac (patch)
tree4bd4733baa4ad82d4d0e2b37ee208e2654c446ba
parent28ba006c1acddff992ae946d0bc0b500b531ba6b (diff)
upstream commit
correct paths to configuration files being written/updated; they live in $OBJ not cwd; some by Roumen Petrov
-rw-r--r--regress/forwarding.sh2
-rw-r--r--regress/hostkey-agent.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index f799d4951..42d9f65d1 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: forwarding.sh,v 1.12 2014/07/15 15:54:15 millert Exp $ 1# $OpenBSD: forwarding.sh,v 1.13 2015/02/21 20:51:02 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="local and remote forwarding" 4tid="local and remote forwarding"
diff --git a/regress/hostkey-agent.sh b/regress/hostkey-agent.sh
index c007d7a5e..a011ec831 100644
--- a/regress/hostkey-agent.sh
+++ b/regress/hostkey-agent.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: hostkey-agent.sh,v 1.4 2015/01/27 12:01:36 djm Exp $ 1# $OpenBSD: hostkey-agent.sh,v 1.5 2015/02/21 20:51:02 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="hostkey agent" 4tid="hostkey agent"
@@ -22,7 +22,7 @@ for k in `${SSH} -Q key-plain` ; do
22 ) >> $OBJ/known_hosts.orig 22 ) >> $OBJ/known_hosts.orig
23 ${SSHADD} $OBJ/agent-key.$k >/dev/null 2>&1 || \ 23 ${SSHADD} $OBJ/agent-key.$k >/dev/null 2>&1 || \
24 fatal "couldn't load key $OBJ/agent-key.$k" 24 fatal "couldn't load key $OBJ/agent-key.$k"
25 echo "Hostkey $OBJ/agent-key.${k}" >> sshd_proxy.orig 25 echo "Hostkey $OBJ/agent-key.${k}" >> $OBJ/sshd_proxy.orig
26 # Remove private key so the server can't use it. 26 # Remove private key so the server can't use it.
27 rm $OBJ/agent-key.$k || fatal "couldn't rm $OBJ/agent-key.$k" 27 rm $OBJ/agent-key.$k || fatal "couldn't rm $OBJ/agent-key.$k"
28done 28done