- up to 7.7p1

[packages/openssh.git] / ssh-agent.sh

diff --git a/ssh-agent.sh b/ssh-agent.sh
index 0ac38d0ded1400b06d8e2bfa4ad9fe10e091557b..623c58173799f634cf41c1abebddd759d206cc31 100644 (file)
--- a/ssh-agent.sh
+++ b/ssh-agent.sh
@@ -1,23 +1,26 @@
 #!/bin/sh
-# ssh-agent.sh - linux ver. (make against procps-3.2.1), sh/bash/zsh compatible
-# like gnupg-agent-agent.sh (what the long & insane name!?) put this
-# in /etc/profile.d/ chmod 755 /etc/profile.d/ssh-agent.sh
-# make ln -s /etc/profile.d/ssh-agent.sh /etc/X11/xinit/xinitrc.d/ssh-agent.sh
-# echo "ssh_agent_enable=yes" > $HOME/.ssh/ssh-agent.conf and forget about keychain
+# ssh-agent.sh is a sh/bash/zsh compatible script sourced from /etc/profile.d/
+# at user login. It reads configuration from /etc/ssh/ssh-agent.conf 
+# or ~/.ssh/ssh-agent.conf if any exist and, depending on settings 
+# in configuration file, runs ssh-agent with given options at first user login,
+# exports SSH_AGENT_PID SSH_AUTH_SOCK environment variables to all login 
+# sessions. If ssh-agent is already started for given user, script exports only
+# SSH_AGENT_PID SSH_AUTH_SOCK to new user's login session.
 
-SSH_AGENT_CONF="${HOME}/.ssh/ssh-agent.conf"
+[ -f /etc/ssh/ssh-agent.conf ] && SSH_AGENT_CONF="/etc/ssh/ssh-agent.conf"
+[ -f "${HOME}/.ssh/ssh-agent.conf" ] && SSH_AGENT_CONF="${HOME}/.ssh/ssh-agent.conf"
 if [ -s "$SSH_AGENT_CONF" ] ; then
        . "$SSH_AGENT_CONF" || :
        if [ "$ssh_agent_enable" = "yes" -o "$ssh_agent_enable" = "YES" ] ; then
                SSH_AGENT_DATA="${HOME}/.ssh/SSH-AGENT-DATA"
                if [ -s "$SSH_AGENT_DATA" ] ; then
                        . "$SSH_AGENT_DATA" > /dev/null
-                       if [ "$(ps -p "$SSH_AGENT_PID" | tail -n1 | awk '{print $4}')" != "ssh-agent" ] ; then
-                               ssh-agent > "$SSH_AGENT_DATA" 2>&1
+                       if [ "$(ps uhp "$SSH_AGENT_PID" 2>/dev/null | awk '$1 ~ ENVIRON["USER"] {print $11}')" != "ssh-agent" ] ; then
+                               ssh-agent $ssh_agent_flags > "$SSH_AGENT_DATA" 
                                . "$SSH_AGENT_DATA" > /dev/null
                        fi
                else
-                       ssh-agent > "$SSH_AGENT_DATA" 2>&1
+                       ssh-agent $ssh_agent_flags > "$SSH_AGENT_DATA" 
                        . "$SSH_AGENT_DATA" > /dev/null
                fi
        fi