summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--contrib/ssh-copy-id2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0248a630..d8cd1a17 100644
--- 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@
@@ -1644,4 +1648,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3161 2004/01/02 07:01:30 djm Exp $
+$Id: ChangeLog,v 1.3162 2004/01/04 21:16:34 dtucker Exp $
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1ad34a8..a1c0a923 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: