From: Philip Hands <phil@hands.com>
Date: Fri, 2 Aug 2024 08:07:11 +0000 (+0200)
Subject: ensure that we're always told the source of keys
X-Git-Tag: V_9_9_P1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=777dce9e2e0d12f7e81e162f77749f30899869fe;p=thirdparty%2Fopenssh-portable.git

ensure that we're always told the source of keys

SSH-Copy-ID-Upstream: 1bee96f4793e8ec3fab9f9361204ae58f5cc7cae
---

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 59317243e..80c30132b 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -107,7 +107,6 @@ use_id_file() {
       exit 1
     }
   done
-  printf '%s: INFO: Source of key(s) to be installed: "%s"\n' "$0" "$PUB_ID_FILE" >&2
   GET_ID="cat \"$PUB_ID_FILE\""
 }
 
@@ -176,6 +175,8 @@ if [ -z "$(eval $GET_ID)" ] && [ -r "${PUB_ID_FILE:=$DEFAULT_PUB_ID_FILE}" ] ; t
   use_id_file "$PUB_ID_FILE"
 fi
 
+printf '%s: INFO: Source of key(s) to be installed: %s\n' "$0" "${GET_ID#cat }" >&2
+
 # shellcheck disable=SC2086
 if [ -z "$(eval $GET_ID)" ] ; then
   printf '%s: ERROR: No identities found\n' "$0" >&2