diff -ru ../gdm-2.14.6/config/Xsession.in gdm-2.14.6/config/Xsession.in

--- ../gdm-2.14.6/config/Xsession.in	2006-05-22 12:06:01.384065000 +0200

+++ gdm-2.14.6/config/Xsession.in	2006-05-22 12:12:16.800423000 +0200

@@ -84,7 +84,7 @@

   else

     echo "$0: Starting the failsafe xterm session."

   fi

-  exec xterm -geometry 80x24+0+0

+  exec ctrun -l child -i none xterm -geometry 80x24+0+0

 fi

 # Note: ~/.xsession-errors is now done in the daemon so that it

@@ -235,7 +235,7 @@

 echo "$0: Setup done, will execute: $command"

-eval exec $command

+eval exec ctrun -l child -i none $command

 echo "$0: Executing $command failed, will run xterm"

@@ -244,4 +244,4 @@

 	"$zenity" --info --text "$disptext"

 fi

-exec xterm -geometry 80x24+0+0

+exec ctrun -l child -i none xterm -geometry 80x24+0+0

diff -ru ../gdm-2.14.6/config/gnome.desktop.in gdm-2.14.6/config/gnome.desktop.in

--- ../gdm-2.14.6/config/gnome.desktop.in	2006-05-22 12:06:01.383674000 +0200

+++ gdm-2.14.6/config/gnome.desktop.in	2006-05-22 12:12:16.798993000 +0200

@@ -1,8 +1,8 @@

 [Desktop Entry]

 Encoding=UTF-8

-_Name=GNOME

-_Comment=This session logs you into GNOME

-Exec=gnome-session

+Exec=ctrun -l child -i none /usr/dt/config/Xsession.jds

 TryExec=gnome-session

 # no icon yet, only the top three are currently used

 Icon=

diff -ru ../gdm-2.14.6/configure.ac gdm-2.14.6/configure.ac

--- ../gdm-2.14.6/configure.ac	2006-05-22 12:06:01.496662000 +0200

+++ gdm-2.14.6/configure.ac	2006-05-22 12:12:16.802731000 +0200

@@ -966,7 +966,7 @@

 elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then

    X_PATH="/usr/X11/bin"

    X_SERVER_PATH="/usr/X11/bin"

-   X_SERVER="/usr/X11/bin/X"

+   X_SERVER="/usr/X11/bin/Xserver"

    GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"

    X_CONFIG_OPTIONS="-audit 0"

 elif test -x /usr/X11R6/bin/X; then

@@ -978,7 +978,7 @@

 elif test -x /usr/X11/bin/X; then

    X_PATH="/usr/X11/bin"

    X_SERVER_PATH="/usr/X11/bin"

-   X_SERVER="/usr/X11/bin/X"

+   X_SERVER="/usr/X11/bin/X/Xserver"

    GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"

    X_CONFIG_OPTIONS="-audit 0"

 elif test -x /usr/openwin/bin/Xsun; then

--- gdm-2.14.7/config/gdm.conf.in-orig	2006-05-23 15:14:20.348352000 -0500

+++ gdm-2.14.7/config/gdm.conf.in	2006-05-23 15:15:13.326816000 -0500

@@ -61,7 +61,7 @@ TimedLoginDelay=30

 # The greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to

 # get the new graphical greeter.

-#Greeter=@libexecdir@/gdmlogin

+Greeter=@libexecdir@/gdmgreeter

 # The greeter for xdmcp logins, usually you want a less graphically intensive

 # greeter here so it's better to leave this with gdmlogin

@@ -87,7 +87,7 @@ TimedLoginDelay=30

 # If you are having trouble with using a single server for a long time and want

 # GDM to kill/restart the server, turn this on.  On Solaris, this value is

 # always true and this configuration setting is ignored.

-#AlwaysRestartServer=false

+AlwaysRestartServer=true

 # User and group used for running GDM GUI applicaitons.  By default this is set

 # to user "gdm" and group "gdm".  This user/group should have very limited

@@ -226,7 +226,7 @@ CheckDirOwner=true

 # Note: Anytime we find a -query or -indirect on the command line we do not add

 # a "-nolisten tcp", as then the query just wouldn't work, so this setting only

 # affects truly local sessions.

-#DisallowTCP=true

+DisallowTCP=false

 # By default never place cookies if we "detect" NFS.  We detect NFS by

 # detecting "root-squashing".  It seems bad practice to place cookies on things

 # that go over the network by default and thus we do not do it by default.

@@ -285,10 +285,10 @@ Enable=false

 # The specific gtkrc file we use.  It should be the full path to the gtkrc that

 # we need.  Unless you need a specific gtkrc that doesn't correspond to a

 # specific theme, then just use the GtkTheme key.

-#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc

+GtkRC=/usr/share/themes/nimbus/gtk-2.0/gtkrc

 # The GTK+ theme to use for the GUI.

-#GtkTheme=Default

+GtkTheme=nimbus

 # If to allow changing the GTK+ (widget) theme from the greeter.  Currently

 # this only affects the standard greeter as the graphical greeter does not yet

 # have this ability.

@@ -370,7 +370,7 @@ Browser=false

 # menu that contains reboot, shutdown, suspend, config and chooser.  None of

 # these is available if this is off.  They can be turned off individually

 # however.

-#SystemMenu=true

+SystemMenu=false

 # Configuration is available from the system menu of the greeter.

 #ConfigAvailable=false

 # Should the chooser button be shown.  If this is shown, GDM can drop into

@@ -406,8 +406,8 @@ DefaultRemoteWelcome=true

 # The Standard greeter (gdmlogin) uses BackgroundColor as the background

 # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor

 # as the background color.

-BackgroundColor=#76848F

-GraphicalThemedColor=#76848F

+BackgroundColor=#35556b

+GraphicalThemedColor=#35556b

 # XDMCP session should only get a color, this is the sanest setting since you

 # don't want to take up too much bandwidth

 #BackgroundRemoteOnlyColor=true

@@ -448,8 +448,8 @@ GraphicalThemedColor=#76848F

 # list then provide a list that is delimited by /: to the GraphicalThemes

 # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme

 # and specify just one theme.

-#GraphicalTheme=circles

-#GraphicalThemes=circles/:happygnome

+GraphicalTheme=Sun-Nimbus

+GraphicalThemes=Sun-Nimbus/:circles/:happygnome

 GraphicalThemeDir=@datadir@/gdm/themes/

 GraphicalThemeRand=false

--- gdm-2.14.7/config/CDE.desktop.in-orig	2006-06-05 23:40:03.552332000 -0500

+++ gdm-2.14.7/config/CDE.desktop.in	2006-06-05 23:40:22.579644000 -0500

@@ -2,7 +2,7 @@

 Encoding=UTF-8

 _Name=CDE

 _Comment=This session logs you into CDE

-Exec=/usr/dt/bin/Xsession

+Exec=ctrun -l child -i none /usr/dt/bin/Xsession

 # no icon yet, only the top three are currently used

 Icon=

 Type=Application

--- gdm-2.14.7/daemon/slave.c-orig	2006-06-05 23:40:33.389283000 -0500

+++ gdm-2.14.7/daemon/slave.c	2006-06-05 23:43:34.281067000 -0500

@@ -3363,6 +3363,8 @@ session_child_run (struct passwd *pwent,

 #else

 	char *argv[7];

 #endif

+	char **argv2;

+	gchar *ctrun;

 #ifdef CAN_USE_SETPENV

 	extern char **newenv;

@@ -3862,7 +3864,17 @@ session_child_run (struct passwd *pwent,

 	}

 #endif

-	VE_IGNORE_EINTR (execv (argv[0], argv));

+	ctrun = g_strdup_printf ("/bin/sh -c \"ctrun -l child -i none %s %s %s %s %s %s %s\"",

+		argv[0] ? argv[0] : "",

+		argv[1] ? argv[1] : "",

+		argv[2] ? argv[2] : "",

+		argv[3] ? argv[3] : "",

+		argv[4] ? argv[4] : "",

+		argv[5] ? argv[5] : "",

+		argv[6] ? argv[6] : "");

+	argv2 = ve_split (ctrun);

+

+	VE_IGNORE_EINTR (execv (argv2[0], argv2));

 	/* will go to .xsession-errors */

 #ifdef HAVE_TSOL

@@ -5186,7 +5198,7 @@ gdm_slave_exec_script (GdmDisplay *d, co

 		       struct passwd *pwent, gboolean pass_stdout)

 {

     pid_t pid;

-    char *script;

+    char *script, *ctrun;

     gchar **argv;

     gint status;

     char *x_servers_file;

@@ -5313,7 +5325,11 @@ gdm_slave_exec_script (GdmDisplay *d, co

 	if ( ! ve_string_empty (d->theme_name))

 		g_setenv ("GDM_GTK_THEME", d->theme_name, TRUE);

 	g_unsetenv ("MAIL");

-	argv = ve_split (script);

+

+	ctrun = g_strdup_printf ("/bin/sh -c \"ctrun -l child -i none %s\"",

+		script);

+	argv = ve_split (ctrun);

+

 	VE_IGNORE_EINTR (execv (argv[0], argv));

 	syslog (LOG_ERR, _("%s: Failed starting: %s"), "gdm_slave_exec_script",

 		script);

--- gdm-2.14.8/gui/modules/AccessDwellMouseEvents.in-orig	2006-06-07 16:58:51.873778000 -0500

+++ gdm-2.14.8/gui/modules/AccessDwellMouseEvents.in	2006-06-07 16:59:51.598215000 -0500

@@ -15,7 +15,7 @@

 #   that the initial crossing is a motion In or Out of the window.

 # 

 # e.g.

-# TBLR I 10000    @AT_BINDIR@/gok --login --access-method=dwellselection

+# TBLR I 10000    /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=dwellselection"

 #

 # Means the user crosses into the top border, out the bottom border, into the left

 # border, and then out the right border (in that order).  The initial_direction

@@ -30,24 +30,24 @@

 #

 # e.g.

 #

-# <Add>           @AT_BINDIR@/gnome-mag

+# <Add>           /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gnome-mag"

 # GNOME On-Screen Keyboard - support several different options for different

 # user needs.  Note these gestures all start by moving the mouse into the top

 # window border.

 #

-TBLR I 10000    @AT_BINDIR@/gok --login --access-method=dwellselection

-TLBR I 10000    @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch1 --select-action=switch1

-TRBL I 10000    @AT_BINDIR@/gok --login --access-method=inversescanning --scan-action=switch1 --select-action=switch2

-TBRL I 10000    @AT_BINDIR@/gok --login  --access-method=automaticscanning --scan-action=switch3 --select-action=switch3

+TBLR I 10000    /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=dwellselection"

+TLBR I 10000    /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch1 --select-action=switch1"

+TRBL I 10000    /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=inversescanning --scan-action=switch1 --select-action=switch2"

+TBRL I 10000    /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login  --access-method=automaticscanning --scan-action=switch3 --select-action=switch3"

 # Gnopernicus.  Note these gestures all start by moving the mouse into the

 # bottom window border.

 #

 # Speech

-BTRL I 10000    @AT_BINDIR@/srcore --login --enable-speech

+BTRL I 10000    /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/srcore --login --enable-speech"

 # Magnifier

-BTLR I 10000    @AT_BINDIR@/srcore --login --enable-magnifier --disable-speech --disable-braille

+BTLR I 10000    /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/srcore --login --enable-magnifier --disable-speech --disable-braille"

 # Speech and Magnifier

-BRTL I 10000    @AT_BINDIR@/srcore --login

+BRTL I 10000    /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/srcore --login"

--- gdm-2.14.8/gui/modules/AccessKeyMouseEvents.in-orig	2006-06-07 17:00:02.882131000 -0500

+++ gdm-2.14.8/gui/modules/AccessKeyMouseEvents.in	2006-06-07 17:01:09.581323000 -0500

@@ -15,7 +15,7 @@

 #

 # e.g.

 #

-# <Control>k  5 1000 10000  @AT_BINDIR@/gok --login --access-method=directselection

+# <Control>k  5 1000 10000  /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=directselection"

 #

 # Means press Contol-k 5 times, holding each keypress down for at least 1000ms

 # each time and with no greater interval than 10000ms between each event in the

@@ -26,8 +26,8 @@

 # otherwise the sequence will be lost.

 #

 # e.g.

-# Shift_L  5 1000 10000  @AT_BINDIR@/gok --login --access-method=directselection

-# Shift_R  5 1000 10000  @AT_BINDIR@/gok --login --access-method=directselection

+# Shift_L  5 1000 10000  /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=directselection"

+# Shift_R  5 1000 10000  /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=directselection"

 #

 # Will start gok if you press either shift key 5 times holding it down for more

 # then 1 second each time.

@@ -39,7 +39,7 @@

 #

 # e.g.

 #

-# <Mouse2>  4 3000 6000  @AT_BINDIR@/gnopernicus

+# <Mouse2>  4 3000 6000  /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gnopernicus"

 #

 # Note that mouse numbers are 1-based so <Mouse1> is the left mouse button,

 # <Mouse3> is the right mouse button and <Mouse2> is the middle mouse button.

@@ -51,27 +51,27 @@

 #

 # e.g.

 #

-# <Add>  @AT_BINDIR@/gnome-mag

+# <Add>  /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gnome-mag"

 #

 # Note that pressing any other keys 

 # current:

 # hold right or left mouse button 3 times for 3 seconds each time

-<Mouse1> 3 3000 10000 @AT_BINDIR@/gok --login --access-method=directselection

+<Mouse1> 3 3000 10000 /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=directselection"

 # we add the right mouse button as it may be the left mouse button

 # for a left handed user

-<Mouse3> 3 3000 10000 @AT_BINDIR@/gok --login --access-method=directselection

+<Mouse3> 3 3000 10000 /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=directselection"

-<Switch1> 1 5000 0 @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch1 --select-action=switch1

-<Switch2> 3 50 3000 @AT_BINDIR@/gok --login --access-method=inversescanning --scan-action=switch1 --select-action=switch2

-<Switch3> 3 1000 10000 @AT_BINDIR@/gok --login  --access-method=automaticscanning --scan-action=switch3 --select-action=switch3

+<Switch1> 1 5000 0 /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch1 --select-action=switch1"

+<Switch2> 3 50 3000 /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login --access-method=inversescanning --scan-action=switch1 --select-action=switch2"

+<Switch3> 3 1000 10000 /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/gok --login  --access-method=automaticscanning --scan-action=switch3 --select-action=switch3"

 # press ctrl-s for 1 second to launch gnopernicus speech

 # gnopernicus, speech mode

-<Control>s  1 1000 10000  @AT_BINDIR@/srcore --login --enable-speech

+<Control>s  1 1000 10000  /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/srcore --login --enable-speech"

 # press ctrl-m for 1 second to launch gnopernicus magnifier

-<Control>m  1 1000 10000  @AT_BINDIR@/srcore --login --enable-magnifier --disable-speech --disable-braille

+<Control>m  1 1000 10000  /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/srcore --login --enable-magnifier --disable-speech --disable-braille"

 # press ctrl-g for 1 second to launch both gnopernicus speech and magnifier

-<Control>g  1 1000 10000  @AT_BINDIR@/srcore --login

+<Control>g  1 1000 10000  /bin/sh -c "ctrun -l child -i none @AT_BINDIR@/srcore --login"