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 @@
+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.
 
@@ -3519,4 +3523,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4817 2008/01/02 07:08:45 dtucker Exp $
+$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
   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"