[openssh-commits] [openssh] 01/03: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 1a779a0dd6cd8b4a1a40ea33b5415ab8408128ac
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Sat Feb 21 20:51:02 2015 +0000

    upstream commit
    
    correct paths to configuration files being written/updated;
     they live in $OBJ not cwd; some by Roumen Petrov
---
 regress/forwarding.sh    | 2 +-
 regress/hostkey-agent.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index f799d49..42d9f65 100644
--- a/regress/forwarding.sh
+++ b/regress/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"
diff --git a/regress/hostkey-agent.sh b/regress/hostkey-agent.sh
index c007d7a..a011ec8 100644
--- a/regress/hostkey-agent.sh
+++ b/regress/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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.