jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix outputs

Browse source
This commit is contained in:
Jakobus Schürz 2023-08-10 17:06:22 +02:00 committed by Jakobus Schürz
parent a6244e7963
commit b9eba8b40f
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/startagent
View file

@ -381,7 +381,18 @@ logdebug "ssh_idendity: ${ssh_identity}"
unset SSH_AUTH_SOCK SSH_AGENT_PID PKCS11_MODULE SSH_AGENT_ALLOW_FROM_REMOTE unset SSH_AUTH_SOCK SSH_AGENT_PID PKCS11_MODULE SSH_AGENT_ALLOW_FROM_REMOTE
ssh_agentfile=$(create_agentfilename)
ssh_socketfile=$(create_socketfilename)
set_and_load_identity_config ${ssh_identity} set_and_load_identity_config ${ssh_identity}
sed -i -e '/PKCS11_MODULE/d' ${ssh_agentfile}
if [ -n ${PKCS11_MODULE:+x} ]
then
echo "PKCS11_MODULE=${PKCS11_MODULE}; export PKCS11_MODULE" >> ${ssh_agentfile}
fi
[ -e $ssh_agentfile ] && eval $(<${ssh_agentfile}) >/dev/null
logdebug " PKCS11_MODULE=${PKCS11_MODULE:-not set}"
logdebug " SSH_ADD_OPTIONS=${SSH_ADD_OPTIONS:-not set}" logdebug " SSH_ADD_OPTIONS=${SSH_ADD_OPTIONS:-not set}"
logdebug "SSH_AGENT_ALLOW_FROM_REMOTE=${SSH_AGENT_ALLOW_FROM_REMOTE:-false}" logdebug "SSH_AGENT_ALLOW_FROM_REMOTE=${SSH_AGENT_ALLOW_FROM_REMOTE:-false}"
logdebug " PKCS11_MODULE=${PKCS11_MODULE:-not set}" logdebug " PKCS11_MODULE=${PKCS11_MODULE:-not set}"
@ -390,10 +401,6 @@ logdebug " SSH_AUTH_SOCK=${SSH_AUTH_SOCK:-not set}"
logdebug " SSH_AUTH_SOCK_REMOTE=${SSH_AUTH_SOCK_REMOTE:-not set}" logdebug " SSH_AUTH_SOCK_REMOTE=${SSH_AUTH_SOCK_REMOTE:-not set}"
logdebug " ssh_idendity=${ssh_identity}" logdebug " ssh_idendity=${ssh_identity}"
ssh_agentfile=$(create_agentfilename)
ssh_socketfile=$(create_socketfilename)
[ -e $ssh_agentfile ] && eval $(<$ssh_agentfile) >&2
check_and_link_socket check_and_link_socket
logdebug "SSH_AGENT_FILE=${ssh_agentfile}" logdebug "SSH_AGENT_FILE=${ssh_agentfile}"
logdebug " SSH_AGENT_PID=${SSH_AGENT_PID}" logdebug " SSH_AGENT_PID=${SSH_AGENT_PID}"