From 06578e895399d63fe148205b0034e15b8fa94605 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Tue, 17 Jul 2007 09:38:24 +0000
Subject: * ssh-copy-id no longer prints the output of expr (thanks, Peter  
 Eisentraut; closes: #291534).

---
 contrib/ssh-copy-id | 2 +-
 debian/changelog    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 84db5db51..093fb2668 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"
diff --git a/debian/changelog b/debian/changelog
index 77a063bca..fb1ae9750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ openssh (1:4.6p1-5) UNRELEASED; urgency=low
     still useful as a quick way to install both the client and the server.
   * ssh-copy-id checks the exit status of ssh-add -L (thanks, Adeodato Simó;
     closes: #221675).
+  * ssh-copy-id no longer prints the output of expr (thanks, Peter
+    Eisentraut; closes: #291534).
   * debconf template translations:
     - Update Catalan (thanks, Jordà Polo; closes: #431970).
 
-- 
cgit v1.2.3