From 57e3c22453dda12b2e73cd9a6dddae7fe1f4377a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Thu, 3 Feb 2022 17:27:26 +0100
Subject: [PATCH] fix key when empty P11M

---
 bin/startagent | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/startagent b/bin/startagent
index eaac311..b20ed4d 100755
--- a/bin/startagent
+++ b/bin/startagent
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+FILELOGLEVEL=DEBUG
 # loggerfactory
 LANG=C
 for f in logerror logwarn loginfo logdebug logtrace ENTRY EXIT SCRIPTENTRY SCRIPTEXIT; do
@@ -318,10 +319,12 @@ agent-load-identity-keys () {
 
 
                 for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/*|grep  "\.so$"); do
-                    logdebug "P11M: ${P11M:-not set} - key: $key"
+                    echo "key: $key"
+                    logdebug "P11M1: ${P11M:-not set} - key: $key"
                     #[ -e "${P11M-x}" ] || [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M"
-                    [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M"
-                    logdebug "P11M: ${P11M:-not set} - key: $key"
+                    #[ "$(readlink - f $key)" == "$P11M" ] || key="$P11M"
+                    [ "$(readlink -f $key)" != "$P11M" -a "${P11M:-x}" != "x" ] && key="$P11M"
+                    logdebug "P11M2: ${P11M:-not set} - key: $key"
                     echo "P11M: ${P11M:-not set} - key: $key"
 
                     tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')"