Import of OpenSSH 4.9p1

[gssapi-openssh.git] / openssh / contrib / ssh-copy-id

diff --git a/openssh/contrib/ssh-copy-id b/openssh/contrib/ssh-copy-id
index 1555b5d376c6bd115b3ef9c9e646e27144ac7084..acd36d398721f6fec3668626f7112fc22d6b80e8 100644 (file)
--- a/openssh/contrib/ssh-copy-id
+++ b/openssh/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"