diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2021-10-23 18:01:40 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-10-23 18:01:40 -0600 |
| commit | fad92c603be0ff36825cc53bf8c485d4b95c7869 (patch) | |
| tree | 407fe826be62a3543b6feab4f3552f58575234de /plugins/ssh-agent | |
| parent | c674485e6b4abe313469900997d893d2940ee843 (diff) | |
| parent | f1dd97bb2a9df55fae9b1ca26c829b9f8b290667 (diff) | |
| download | zsh-fad92c603be0ff36825cc53bf8c485d4b95c7869.tar.gz zsh-fad92c603be0ff36825cc53bf8c485d4b95c7869.tar.bz2 zsh-fad92c603be0ff36825cc53bf8c485d4b95c7869.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/ssh-agent')
| -rw-r--r-- | plugins/ssh-agent/README.md | 18 | ||||
| -rw-r--r-- | plugins/ssh-agent/ssh-agent.plugin.zsh | 13 |
2 files changed, 26 insertions, 5 deletions
diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md index d1a504b1e..1d6914ec6 100644 --- a/plugins/ssh-agent/README.md +++ b/plugins/ssh-agent/README.md @@ -21,7 +21,23 @@ zstyle :omz:plugins:ssh-agent agent-forwarding on ---- -To **load multiple identities** use the `identities` style, For example: +To **NOT load any identities on start** use the `lazy` setting. This is particularly +useful when combined with the `AddKeysToAgent` setting (available since OpenSSH 7.2), +since it allows to enter the password only on first use. _NOTE: you can know your +OpenSSH version with `ssh -V`._ + +```zsh +zstyle :omz:plugins:ssh-agent lazy yes +``` + +You can enable `AddKeysToAgent` by passing `-o AddKeysToAgent=yes` to the `ssh` command, +or by adding `AddKeysToAgent yes` to your `~/.ssh/config` file [1]. +See the [OpenSSH 7.2 Release Notes](http://www.openssh.com/txt/release-7.2). + +---- + +To **load multiple identities** use the `identities` style (**this has no effect +if the `lazy` setting is enabled**). For example: ```zsh zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh index 2d7d8a2a0..47dfef5b0 100644 --- a/plugins/ssh-agent/ssh-agent.plugin.zsh +++ b/plugins/ssh-agent/ssh-agent.plugin.zsh @@ -6,9 +6,11 @@ function _start_agent() { if [[ -f "$ssh_env_cache" ]]; then . "$ssh_env_cache" > /dev/null - { - [[ "$USERNAME" = root ]] && command ps ax || command ps x - } | command grep ssh-agent | command grep -q $SSH_AGENT_PID && return 0 + # Test if $SSH_AUTH_SOCK is visible + zmodload zsh/net/socket + if [[ -S "$SSH_AUTH_SOCK" ]] && zsocket "$SSH_AUTH_SOCK" 2>/dev/null; then + return 0 + fi fi # Set a maximum lifetime for identities added to ssh-agent @@ -96,7 +98,10 @@ else _start_agent fi -_add_identities +# Don't add identities if lazy-loading is enabled +if ! zstyle -t :omz:plugins:ssh-agent lazy; then + _add_identities +fi unset agent_forwarding ssh_env_cache unfunction _start_agent _add_identities |