From aa9982fdbe7b78de1c819fe02d4d3ed6ebf7f24a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@bmi.gv.at>
Date: Tue, 7 Mar 2023 18:13:01 +0100
Subject: [PATCH] fix some output

---
 bin/startagent | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bin/startagent b/bin/startagent
index 9f17475..f60d39a 100755
--- a/bin/startagent
+++ b/bin/startagent
@@ -98,7 +98,7 @@ while :; do
             exit 0
             ;;
         -*)
-            echo "Unknown urgument: »$1«"
+            echo "Unknown urgument: »$1«" >&2
             exit 1
             ;;
         *)
@@ -173,7 +173,6 @@ agent_start_or_restart () {
             #logdebug "ssh-agent for identity »$ssh_identity«: $agentfile"
             $createonly && logtrace "current loaded keys after action:
 $(ssh_runinagent $agentfile ssh-add -l)"
-            echo $agentfile
             ret=0
         else
             logwarning "ssh-identity »$ssh_identity« is not configured. Please create $identitydir and add keys"
@@ -191,7 +190,6 @@ $(ssh_runinagent $agentfile ssh-add -l)"
             logdebug "ssh-agent for identity »$ssh_identity«: $agentfile"
 #            logdebug "currently loaded keys after action: 
 #$(ssh_runinagent $agentfile ssh-add -l)"
-            echo $agentfile
             ret=0
         else
             logwarning "no identity given -> exit"
@@ -286,7 +284,6 @@ agent_load_identity_keys () {
 
 
                 for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/*|grep  "\.so$"); do
-                    echo "key: $key"
                     logdebug "PKCS11_MODULE: ${PKCS11_MODULE:-not set} - key: $key"
                     #[ -e "${P11M-x}" ] || [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M"
                     #[ "$(readlink - f $key)" == "$P11M" ] || key="$P11M"
@@ -295,7 +292,7 @@ agent_load_identity_keys () {
                     export P11M=$PKCS11_MODULE
                     logdebug "PKCS11_MODULE: ${PKCS11_MODULE:-not set} - key: $key"
                     grep -q "PKCS11_MODULE" "${agentfile}" >/dev/null 2>&1 && sed -i -e '/PKCS11_MODULE/d' "${agentfile}"
-                    echo "PKCS11_MODULE=$(readlink -f $key)" | tee -a "${agentfile}"
+                    echo "PKCS11_MODULE=$(readlink -f $key)" | tee -a "${agentfile}" >&2
 
                     tokenfingerprints=($(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}'))
 
@@ -315,7 +312,6 @@ agent_load_identity_keys () {
                                 $remove && logdebug "remove token $key"
                                 logtrace "agentfile1 $agentfile \$SSH_ADD_OPTIONS $key "
                                 logdebug "$(ssh_runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e "${key}" 2>&1)"
-                                ssh_runinagent $agentfile echo $SSH_AUTH_SOCK >&2
                                 $remove || logdebug "$(ssh_runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s "${key}" 2>&1)"
                             fi
                         else