From 89219df14386c10bcae4f20430013565fa4436e2 Mon Sep 17 00:00:00 2001
From: Mitchell Riedstra <mitch@riedstra.dev>
Date: Mon, 29 Dec 2025 08:54:55 -0500
Subject: Tweak checkSSHAgentForward to be more reliable.

---
 kshrc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'kshrc')

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
 }
-- 
cgit v1.2.3