$OpenBSD: patch-data_Xsession_in,v 1.1 2011/09/12 07:39:21 ajacoutot Exp $
--- data/Xsession.in.orig	Mon Mar  7 18:40:37 2011
+++ data/Xsession.in	Thu Jun 16 15:03:29 2011
@@ -23,6 +23,8 @@
 # based on:
 # $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
 
+PATH="$PATH:${LOCALBASE}/bin"
+
 command="$@"
 
 # this will go into the .xsession-errors along with all other echo's
@@ -178,6 +180,9 @@ if [ "x$command" = "xdefault" ] ; then
     command="/etc/X11/xinit/Xclients"
   elif [ -x /etc/X11/Xclients ]; then
     command="/etc/X11/Xclients"
+  elif [ -x "/etc/X11/xdm/Xsession" ]; then
+    # Load the default OpenBSD
+    command="/etc/X11/xdm/Xsession"
   else
     if [ -n "$zenity" ] ; then
 	disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session.  Windows will have focus only if the mouse pointer is above them.  To get out of this mode type 'exit' in the window."`
@@ -189,12 +194,19 @@ if [ "x$command" = "xdefault" ] ; then
   fi
 fi
 
+#  * gnome-session is not used (in which case gnome-keyring handles
+#    ssh-agent functionality)
+#  * OpenBSD default Xsession isn't used (as it already starts ssh-agent)
+if [ "x$command" != "xgnome-session" ] && [ "x$command" != "x/etc/X11/xdm/Xsession" ] ; then
+
 # add ssh-agent if found
 sshagent="`gdmwhich ssh-agent`"
 if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
     command="$sshagent -- $command"
 elif [ -z "$sshagent" ] ; then
     echo "$0: ssh-agent not found!"
+fi
+
 fi
 
 echo "$0: Setup done, will execute: $command"