summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-28 10:23:26 +1100
committerDamien Miller <djm@mindrot.org>2014-02-28 10:23:26 +1100
commitd705d987c27f68080c8798eeb5262adbdd6b4ffd (patch)
tree8511656e89595cf165b771d96f14099cdb24c8ca
parent624a3ca376e3955a4b9d936c9e899e241b65d357 (diff)
downloadopenssh-git-d705d987c27f68080c8798eeb5262adbdd6b4ffd.tar.gz
- djm@cvs.openbsd.org 2014/01/26 10:49:17
[scp-ssh-wrapper.sh scp.sh] make sure $SCP is tested on the remote end rather than whichever one happens to be in $PATH; from portable (Id sync only)
-rw-r--r--ChangeLog5
-rw-r--r--regress/scp-ssh-wrapper.sh2
-rw-r--r--regress/scp.sh2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a5e7aaf..8f206f56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,11 @@
automatically generate revoked keys from listed keys rather than
manually specifying each type; from portable
(Id sync only)
+ - djm@cvs.openbsd.org 2014/01/26 10:49:17
+ [scp-ssh-wrapper.sh scp.sh]
+ make sure $SCP is tested on the remote end rather than whichever one
+ happens to be in $PATH; from portable
+ (Id sync only)
- (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Crank version numbers
diff --git a/regress/scp-ssh-wrapper.sh b/regress/scp-ssh-wrapper.sh
index c63bc2bc..59f1ff63 100644
--- a/regress/scp-ssh-wrapper.sh
+++ b/regress/scp-ssh-wrapper.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: scp-ssh-wrapper.sh,v 1.2 2005/12/14 04:36:39 dtucker Exp $
+# $OpenBSD: scp-ssh-wrapper.sh,v 1.3 2014/01/26 10:49:17 djm Exp $
# Placed in the Public Domain.
printname () {
diff --git a/regress/scp.sh b/regress/scp.sh
index c2da2a86..57cc7706 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: scp.sh,v 1.9 2013/05/17 10:35:43 dtucker Exp $
+# $OpenBSD: scp.sh,v 1.10 2014/01/26 10:49:17 djm Exp $
# Placed in the Public Domain.
tid="scp"