From: djm <djm>
Date: Sat, 19 Jan 2008 18:52:04 +0000 (+0000)
Subject:  - (djm) Silence noice from expr in ssh-copy-id; patch from
X-Git-Tag: V_4_9_P1~85
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/efcc134b9fc17b2eb8523160c0e7c36c8667a669

 - (djm) Silence noice from expr in ssh-copy-id; patch from
   mikel AT mikelward.com
---

diff --git a/ChangeLog b/ChangeLog
index 6396dde6..c059b882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20080119
+ - (djm) Silence noice from expr in ssh-copy-id; patch from
+   mikel AT mikelward.com
+
 20080102
  - (dtucker) [configure.ac] Fix message for -fstack-protector-all test.
 
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 1555b5d3..acd36d39 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -11,7 +11,7 @@ if [ "-i" = "$1" ]; then
   shift
   # check if we have 2 parameters left, if so the first is the new ID file
   if [ -n "$2" ]; then
-    if expr "$1" : ".*\.pub" ; then
+    if expr "$1" : ".*\.pub" > /dev/null ; then
       ID_FILE="$1"
     else
       ID_FILE="$1.pub"