From: short <>
Date: Mon, 28 Mar 2005 05:41:38 +0000 (+0000)
Subject: Prevent adding keys multiple times for phrase-protected keys in VAJ.
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=00ec596f1a69dd06e6a93dc5e9cf6adcdcc6d867

Prevent adding keys multiple times for phrase-protected keys in VAJ.
---

diff --git a/bin/ssh-agent-spawn b/bin/ssh-agent-spawn
index b4e5b07..88fa34c 100644
--- a/bin/ssh-agent-spawn
+++ b/bin/ssh-agent-spawn
@@ -13,7 +13,10 @@ if lockfile -1 -r 3 -l 10 -s 1 $agenteval.lock;then
 		source $agenteval >/dev/null
 	fi
 	rm -f $agenteval.lock
-	# "2>/dev/null" to prevent: Identity added: .ssh/id_dsa (.ssh/id_dsa)
-	ssh-add ~/.ssh/id_dsa 2>/dev/null
+	for key in $HOME/.ssh/id_dsa;do
+		(ssh-add -l|grep -qw "$key") ||
+				# "2>/dev/null" to prevent: Identity added: .ssh/id_dsa (.ssh/id_dsa)
+				ssh-add "$key" 2>/dev/null
+	done
 fi
 unset agenteval