- (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from

   cjwatson at debian.org.

diff --git a/ChangeLog b/ChangeLog
index 673e3dab88fec7b8231ef33ce25590b313087d78..c5ef7de6846fe432e7644b1e5c77cd0f9926e406 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040105
+ - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails.  Patch from
+   cjwatson at debian.org.
+
 20040102
  - (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from
    jakob@

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1ad34a8d421a817175e7588003ef2cd51399ff3..a1c0a9234316ce7e843f0d7237fafbeca3ffc7cb 100644 (file)
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -38,7 +38,7 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
   exit 1
 fi
 
-{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys"
+{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
 
 cat <<EOF
 Now try logging into the machine, with "ssh '$1'", and check in: