summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/ssh-copy-id2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 84db5db51..093fb2668 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -11,7 +11,7 @@ if [ "-i" = "$1" ]; then
11 shift 11 shift
12 # check if we have 2 parameters left, if so the first is the new ID file 12 # check if we have 2 parameters left, if so the first is the new ID file
13 if [ -n "$2" ]; then 13 if [ -n "$2" ]; then
14 if expr "$1" : ".*\.pub" ; then 14 if expr "$1" : ".*\.pub" >/dev/null; then
15 ID_FILE="$1" 15 ID_FILE="$1"
16 else 16 else
17 ID_FILE="$1.pub" 17 ID_FILE="$1.pub"
diff --git a/debian/changelog b/debian/changelog
index 77a063bca..fb1ae9750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ openssh (1:4.6p1-5) UNRELEASED; urgency=low
4 still useful as a quick way to install both the client and the server. 4 still useful as a quick way to install both the client and the server.
5 * ssh-copy-id checks the exit status of ssh-add -L (thanks, Adeodato Simó; 5 * ssh-copy-id checks the exit status of ssh-add -L (thanks, Adeodato Simó;
6 closes: #221675). 6 closes: #221675).
7 * ssh-copy-id no longer prints the output of expr (thanks, Peter
8 Eisentraut; closes: #291534).
7 * debconf template translations: 9 * debconf template translations:
8 - Update Catalan (thanks, Jordà Polo; closes: #431970). 10 - Update Catalan (thanks, Jordà Polo; closes: #431970).
9 11