From 7b867673a637c0887889c89760a8f56949c287e3 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sat, 10 Jul 2004 12:53:05 +0000
Subject: Apply upstream bits of the patch for #258517.

---
 contrib/ssh-copy-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'contrib/ssh-copy-id')

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1c0a9234..1555b5d37 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -24,7 +24,7 @@ else
   fi
 fi
 
-if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then
+if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
   GET_ID="cat ${ID_FILE}"
 fi
 
-- 
cgit v1.2.3