aboutsummaryrefslogtreecommitdiff
path: root/kshrc
diff options
context:
space:
mode:
authorMitchell Riedstra <mitch@riedstra.dev>2025-12-29 08:54:55 -0500
committerMitchell Riedstra <mitch@riedstra.dev>2025-12-29 08:54:55 -0500
commit89219df14386c10bcae4f20430013565fa4436e2 (patch)
treeb5713161212e4e1fcc4733184f120d1388d8c5b3 /kshrc
parentc0d94cdc444c06356c1b64d5a7073ff41dffab81 (diff)
downloaddotfiles-89219df14386c10bcae4f20430013565fa4436e2.tar.gz
dotfiles-89219df14386c10bcae4f20430013565fa4436e2.tar.xz
Tweak checkSSHAgentForward to be more reliable.
Diffstat (limited to 'kshrc')
-rw-r--r--kshrc5
1 files changed, 3 insertions, 2 deletions
diff --git a/kshrc b/kshrc
index bfd0d44..1bed28b 100644
--- a/kshrc
+++ b/kshrc
@@ -322,16 +322,17 @@ sshSetAskpass() {
checkSSHAgentForward() {
if ! [ -d "$HOME"/.ssh ] ; then
mkdir -p "$HOME"/.ssh
- chmod 600 "$HOME"/.ssh
+ chmod 700 "$HOME"/.ssh
fi
if [ -z "$SSH_AGENT_PID" ] \
&& [ -n "$SSH_CONNECTION" ] \
+ && [ -n "$SSH_AUTH_SOCK" ] \
&& [ -z "$TMUX" ] ; then
echo "SSH_AUTH_SOCK=\"$SSH_AUTH_SOCK\"; export SSH_AUTH_SOCK" \
> "$HOME"/.ssh/agent_conf
- elif [ -n "$TMUX" ]; then
+ elif [ -t 0 ]; then
. "$HOME"/.ssh/agent_conf
fi
}