--- /etc/X11/xinit/xinitrc-common.ORIGINAL	2005-04-11 04:43:11.000000000 -0700
+++ /etc/X11/xinit/xinitrc-common	2005-09-13 08:30:03.000000000 -0700
@@ -55,15 +55,13 @@
     fi
 done
 
-# Prefix launch of session with ssh-agent if available and not already running.
-SSH_AGENT=
-if [ -x /usr/bin/ssh-agent -a -z "$SSH_AGENT_PID" ]; then
-    if [ "x$TMPDIR" != "x" ]; then
-        SSH_AGENT="/usr/bin/ssh-agent /bin/env TMPDIR=$TMPDIR"
-    else
-        SSH_AGENT="/usr/bin/ssh-agent"
-  fi
-fi
+# Explicitly execute ssh-agent if it exists and a process is running 
+# (i.e. revert to FC3 behavior). This FC4 fix ensures that all 
+# daughters of X inherit authentication information. See Bugzilla
+# Bug 159624 and posts related to the following in fedora-list for more:
+# https://www.redhat.com/archives/fedora-list/2005-August/msg03319.html
+if [ -x /usr/bin/ssh-agent -a -z "$SSH_AGENT_PID" ] && eval $(/usr/bin/ssh-agent -s)
+
 
 DBUS_LAUNCH=
 [ -x /usr/bin/dbus-launch -a -z "$DBUS_SESSION_BUS_ADDRESS" ] && DBUS_LAUNCH="/usr/bin/dbus-launch --exit-with-session"