diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:27:24 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 02:40:28 +0000 |
commit | a2b8818c5d21cfcba443625251f691a2ea3a29c7 (patch) | |
tree | 8fe1fe448cde57eecf71a7bcd57186661b90313f /regress/scp.sh | |
parent | d399ecd8eb7d4aed3b7ba0d2727e619607fb901b (diff) | |
parent | ee8d8b97cc2c6081df3af453a228992b87309ec4 (diff) |
Merge 6.5p1.
* New upstream release (http://www.openssh.com/txt/release-6.5,
LP: #1275068):
- ssh(1): Add support for client-side hostname canonicalisation using a
set of DNS suffixes and rules in ssh_config(5). This allows
unqualified names to be canonicalised to fully-qualified domain names
to eliminate ambiguity when looking up keys in known_hosts or checking
host certificate names (closes: #115286).
Diffstat (limited to 'regress/scp.sh')
-rw-r--r-- | regress/scp.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/regress/scp.sh b/regress/scp.sh index 29c5b35d4..c2da2a862 100644 --- a/regress/scp.sh +++ b/regress/scp.sh | |||
@@ -20,6 +20,7 @@ SRC=`dirname ${SCRIPT}` | |||
20 | cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp | 20 | cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp |
21 | chmod 755 ${OBJ}/scp-ssh-wrapper.scp | 21 | chmod 755 ${OBJ}/scp-ssh-wrapper.scp |
22 | scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp" | 22 | scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp" |
23 | export SCP # used in scp-ssh-wrapper.scp | ||
23 | 24 | ||
24 | scpclean() { | 25 | scpclean() { |
25 | rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2} | 26 | rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2} |