aboutsummaryrefslogtreecommitdiff
path: root/ssh-agent-loadkeys
diff options
context:
space:
mode:
Diffstat (limited to 'ssh-agent-loadkeys')
-rwxr-xr-xssh-agent-loadkeys14
1 files changed, 9 insertions, 5 deletions
diff --git a/ssh-agent-loadkeys b/ssh-agent-loadkeys
index fe79552..81dfe1b 100755
--- a/ssh-agent-loadkeys
+++ b/ssh-agent-loadkeys
@@ -22,11 +22,15 @@ if [ -x '/usr/bin/keychain' ]; then
#fi
# Check for monkeysphere
- #if [ -x '/usr/bin/monkeysphere' ]; then
- # if ! ssh-add -l &> /dev/null && [ "`gpg --list-secret-keys | wc -l`" != "0" ]; then
- # monkeysphere subkey-to-ssh-agent
- # fi
- #fi
+ if [ -x '/usr/bin/monkeysphere' ]; then
+ #if ! ssh-add -l &> /dev/null && [ "`gpg --list-secret-keys | wc -l`" != "0" ]; then
+ # From MONKEYSPHERE(1): "The MONKEYSPHERE_SUBKEYS_FOR_AGENT environment can be used to specify the full
+ # fingerprints of specific keys to add to the agent (space separated), instead
+ # of adding them all."
+ if [ ! -z "$MONKEYSPHERE_SUBKEYS_FOR_AGENT" ]; then
+ monkeysphere subkey-to-ssh-agent
+ fi
+ fi
# Check for RSA key
if [ -e "$HOME/.ssh/id_rsa" ]; then