summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--contrib/ssh-copy-id7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84adce11a..9c85c7993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120030103
2 - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from
3 cjwatson@debian.org
4
120030101 520030101
2 - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable 6 - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable
3 parts of pass addrlen with sockaddr * fix. 7 parts of pass addrlen with sockaddr * fix.
@@ -917,4 +921,4 @@
917 save auth method before monitor_reset_key_state(); bugzilla bug #284; 921 save auth method before monitor_reset_key_state(); bugzilla bug #284;
918 ok provos@ 922 ok provos@
919 923
920$Id: ChangeLog,v 1.2537 2003/01/01 23:43:55 stevesk Exp $ 924$Id: ChangeLog,v 1.2538 2003/01/03 03:34:06 djm Exp $
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 2346761f7..a1ad34a8d 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -29,7 +29,12 @@ if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then
29fi 29fi
30 30
31if [ -z "`eval $GET_ID`" ]; then 31if [ -z "`eval $GET_ID`" ]; then
32 echo "$0: ERROR: No identities found" 32 echo "$0: ERROR: No identities found" >&2
33 exit 1
34fi
35
36if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
37 echo "Usage: $0 [-i [identity_file]] [user@]machine" >&2
33 exit 1 38 exit 1
34fi 39fi
35 40