summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--contrib/ssh-copy-id2
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ad5b66a78..00c74c3e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120130605 120130605
2 - (dtucker) Enable sha256 kex methods based on the presence of the necessary 2 - (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of
3 functions, not from the openssl version. 3 the necessary functions, not from the openssl version.
4 - (dtucker) [contrib/ssh-copy-id] bz#2117: Use portable operator in test.
5 Patch from cjwatson at debian.
4 6
520130602 720130602
6 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy 8 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 9f2817b6b..ae88e9958 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -165,7 +165,7 @@ done
165 165
166eval set -- "$SAVEARGS" 166eval set -- "$SAVEARGS"
167 167
168if [ $# == 0 ] ; then 168if [ $# = 0 ] ; then
169 usage 169 usage
170fi 170fi
171if [ $# != 1 ] ; then 171if [ $# != 1 ] ; then