summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/ssh-copy-id2
-rw-r--r--debian/changelog1
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
38 exit 1 38 exit 1
39fi 39fi
40 40
41{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" 41{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
42 42
43cat <<EOF 43cat <<EOF
44Now try logging into the machine, with "ssh '$1'", and check in: 44Now 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
4 (closes: #198254). 4 (closes: #198254).
5 * Use invoke-rc.d (if it exists) to run the init script. 5 * Use invoke-rc.d (if it exists) to run the init script.
6 * Backport format string bug fix in sshconnect.c (closes: #225238). 6 * Backport format string bug fix in sshconnect.c (closes: #225238).
7 * ssh-copy-id exits if ssh fails (closes: #215252).
7 8
8 -- Colin Watson <cjwatson@debian.org> Tue, 30 Dec 2003 13:38:02 +0000 9 -- Colin Watson <cjwatson@debian.org> Tue, 30 Dec 2003 13:38:02 +0000
9 10