ssh-copy-id exits if ssh fails (closes: #215252).

2 files changed, 2 insertions, 1 deletions

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1ad34a8d..a1c0a9234 100644
--- 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:
diff --git a/debian/changelog b/debian/changelog
index ff1092690..b2b783330 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openssh (1:3.6.1p2-11) UNRELEASED; urgency=low
     (closes: #198254).
   * Use invoke-rc.d (if it exists) to run the init script.
   * Backport format string bug fix in sshconnect.c (closes: #225238).
+  * ssh-copy-id exits if ssh fails (closes: #215252).
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 30 Dec 2003 13:38:02 +0000