jimmy
/
fish-ssh-agent
mirror of https://github.com/danhper/fish-ssh-agent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: jimmy:1d1d5d5737c92e383d73a7503b052858fbec3e32
Branches Tags
jimmy:master
...
compare: jimmy:297392f40cbedb8602f5f84c319a7bf0cd518783
Branches Tags
jimmy:master

3 Commits
1d1d5d5737 ... 297392f40c

Author SHA1 Message Date
Elijah Lynn 297392f40c
Merge 23aa4458a3 into f10d957753 2024-10-21 14:39:05 -07:00
Daniel Perez f10d957753
Merge pull request #20 from scarvalhojr/master 
In an SSH session check forwarded agent first
 2024-10-20 21:23:29 +01:00
Sergio de Carvalho 25230a241f In an SSH session check forwarded agent first 
When in an SSH session, try to connect to a forwarded agent first. If
that fails, only then check if an SSH agent is already running on the
machine.

This fixes a situation where a .ssh/environment file left behind from
a dead agent is checked first, ignoring the forwarded agent and
starting a new agent on the machine.
 2022-09-27 21:46:49 +01:00
1 changed files with 11 additions and 2 deletions
Show Stats Expand all files Collapse all files

13
functions/__ssh_agent_is_started.fish
View File

@ -1,9 +1,18 @@
function __ssh_agent_is_started -d "check if ssh agent is already started"
if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end
if test -n "$SSH_CONNECTION"
# This is an SSH session
ssh-add -l > /dev/null 2>&1
if test $status -eq 0 -o $status -eq 1
# An SSH agent was forwarded
return 0
end
end
if begin; test -f "$SSH_ENV"; and test -z "$SSH_AGENT_PID"; end
source $SSH_ENV > /dev/null
end
if begin; test -z "$SSH_AGENT_PID"; and test -z "$SSH_CONNECTION"; end
if test -z "$SSH_AGENT_PID"
return 1
end