o Merge to OPENSSH_3_6_1P1_GSSAPI_20030408.

[gssapi-openssh.git] / openssh / contrib / ssh-copy-id

diff --git a/openssh/contrib/ssh-copy-id b/openssh/contrib/ssh-copy-id
index 2346761f7af0e6ed84922fe921d596a1b5f1aae5..a1ad34a8d421a817175e7588003ef2cd51399ff3 100644 (file)
--- a/openssh/contrib/ssh-copy-id
+++ b/openssh/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