summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-01-20 05:52:04 +1100
committerDamien Miller <djm@mindrot.org>2008-01-20 05:52:04 +1100
commite27220eb5b55974278dd364e8485de56a45662ed (patch)
treeb6194a28269b1550998c751987ded6d791e019e9
parentd4827ab50c8cacc7af3bab932b89ac4cfdd1e3c1 (diff)
- (djm) Silence noice from expr in ssh-copy-id; patch from
mikel AT mikelward.com
-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 e1985abb2..7f3b0ea9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120080119
2 - (djm) Silence noice from expr in ssh-copy-id; patch from
3 mikel AT mikelward.com
4
120080102 520080102
2 - (dtucker) [configure.ac] Fix message for -fstack-protector-all test. 6 - (dtucker) [configure.ac] Fix message for -fstack-protector-all test.
3 7
@@ -3519,4 +3523,4 @@
3519 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3523 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3520 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3524 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3521 3525
3522$Id: ChangeLog,v 1.4817 2008/01/02 07:08:45 dtucker Exp $ 3526$Id: ChangeLog,v 1.4818 2008/01/19 18:52:04 djm Exp $
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 1555b5d37..acd36d398 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"