From 8aff5cbed75279094e2cf701d6eed38dbe4275b8 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 3 Jan 2003 14:34:06 +1100 Subject: - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from cjwatson@debian.org --- ChangeLog | 6 +++++- contrib/ssh-copy-id | 7 ++++++- 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 @@ +20030103 + - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from + cjwatson@debian.org + 20030101 - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable parts of pass addrlen with sockaddr * fix. @@ -917,4 +921,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2537 2003/01/01 23:43:55 stevesk Exp $ +$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 fi if [ -z "`eval $GET_ID`" ]; then - echo "$0: ERROR: No identities found" + echo "$0: ERROR: No identities found" >&2 + exit 1 +fi + +if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then + echo "Usage: $0 [-i [identity_file]] [user@]machine" >&2 exit 1 fi -- cgit v1.2.3