diff -ur ../openssh-3.8.1p1.orig/contrib/ssh-copy-id ./contrib/ssh-copy-id
--- ../openssh-3.8.1p1.orig/contrib/ssh-copy-id	2005-01-21 11:35:49.000000000 +0100
+++ ./contrib/ssh-copy-id	2005-01-21 11:42:52.000000000 +0100
@@ -11,7 +11,7 @@
   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"