diff -urN -x'*~' gnome-session-2.18.0/gnome-session/Makefile.am ../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/gnome-session/Makefile.am

--- gnome-session-2.18.0/gnome-session/Makefile.am	2007-04-12 17:59:16.954363000 +0000

+++ ../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/gnome-session/Makefile.am	2007-04-12 18:04:53.249935000 +0000

@@ -4,6 +4,7 @@

 INCLUDES =						\

 	$(GNOME_SESSION_CFLAGS)				\

+	$(LIBWNCK_CFLAGS)                               \

 	$(STANDARD_PROPERTIES_CFLAGS)			\

 	$(WARN_CFLAGS)					\

 	$(DISABLE_DEPRECATED_CFLAGS)			\

@@ -33,6 +34,14 @@

 gnome_session_properties_LDADD = $(GNOME_SESSION_LIBS)

 splash_test_LDADD = $(X_LIBS) $(GNOME_SESSION_LIBS)

 logout_test_LDADD = $(X_LIBS) $(GNOME_SESSION_LIBS)

+if XTSOL_DEFINED

+tsoljds_xagent_LDADD = $(XTSOL_LIBS) $(GNOME_SESSION_LIBS)

+endif

+

+if XTSOL_DEFINED

+TSOLJDS_bin = \

+	tsoljds-xagent

+endif

 if SESSION

 noinst_PROGRAMS = \

@@ -43,7 +52,8 @@

 	gnome-session		\

 	gnome-session-save	\

 	gnome-session-remove    \

-	gnome-session-properties

+	gnome-session-properties\

+	$(TSOLJDS_bin)

 endif

 splash_test_SOURCES =	\

+if XTSOL_DEFINED

+tsoljds_xagent_SOURCES =	\

+	tsoljds-xagent.c	\

+	save.c			\

+	save.h			\

+	manager.c		\

+	manager.h		\

+	remote.c		\

+	remote.h		\

+	ice.c			\

+	ice.h			\

+	gsm-keyring.c		\

+	gsm-keyring.h		\

+	splash-widget.c		\

+	splash-widget.h		\

+	logout.c		\

+	logout.h		\

+	prop.c			\

+	command.c		\

+	command.h		\

+	gsm-protocol.c		\

+	gsm-protocol.h		\

+	gsm-typebuiltins.c	\

+	gsm-typebuiltins.h	\

+	headers.h		\

+	util.c			\

+	util.h			\

+	gsm-multiscreen.c	\

+	gsm-multiscreen.h	\

+	gdm-logout-action.c	\

+	gdm-logout-action.h	\

+	tsoljds-misc.c		\

+	tsoljds-misc.h

+endif

+

 gnome_session_save_SOURCES =	\

 	gsm-typebuiltins.c	\

diff -urN -x'*~' gnome-session-2.18.0/gnome-session/tsoljds-xagent.c ../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/gnome-session/tsoljds-xagent.c

--- gnome-session-2.18.0/gnome-session/tsoljds-xagent.c	1970-01-01 00:00:00.000000000 +0000

+++ ../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/gnome-session/tsoljds-xagent.c	2007-04-12 18:03:20.518279000 +0000

@@ -0,0 +1,507 @@

+#include <config.h>

+#ifdef HAVE_XTSOL

+

+#include <glib.h>

+#include <gtk/gtk.h>

+#include <gdk/gdkx.h>

+

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <unistd.h>

+#include <stdlib.h>

+#include <pwd.h>

+

+#include <X11/Xlib.h>

+#include <X11/Xutil.h>

+#include <X11/Xos.h>

+#include <X11/Xatom.h>

+

+#include <stdio.h>

+#include <fcntl.h>

+#include <signal.h>

+#include <zone.h>

+

+#include <priv.h>

+#include <sys/tsol/priv.h>

+#include <tsol/label.h>

+#include <sys/tsol/label.h>

+#include <sys/tsol/label_macro.h>

+#include <X11/extensions/Xtsol.h>

+#include <prof_attr.h>

+#include <secdb.h>

+#include <libgnome/gnome-config.h>

+#include <libgnome/gnome-program.h>

+#include <libgnomeui/gnome-ui-init.h>

+#include <libgnomeui/gnome-client.h>

+

+#include "ice.h"

+#include "headers.h"

+#include "save.h"

+#include "gsm-keyring.h"

+

+gint purge_delay = 30000;

+gint warn_delay = 30000;

+gint suicide_delay = 10000;

+gboolean failsafe = FALSE;

+gboolean autosave = FALSE;

+gboolean save_selected = FALSE;

+gboolean logout_prompt = TRUE;

+gboolean session_save = FALSE;

+gchar *session_name = NULL;

+gboolean managesession = TRUE;

+gboolean trusted_session = FALSE;

+gboolean default_session = FALSE;

+

+typedef struct tcb_component {

+  char *name;

+} tcb_component;

+

+const  tcb_component tcb[]  = {

+	{"metacity" },

+	{"gnome-volcheck" }, /* This is not a tcb component, but it is not zone aware so remove */

+       	{"gnome-panel"},

+       	{"gnome-smproxy"},

+       	{"gnome-wm"},

+       	{"tsoljdsselmgr"},

+       	{"tsoljds-tstripe"}

+};

+

+

+#define _XA_MOTIF_WINDOW       "_MOTIF_DRAG_WINDOW"

+#define _XA_MOTIF_PROXY_WINDOW  "_MOTIF_DRAG_PROXY_WINDOW"

+#define TSOLJDS_MIGRATION_SCRIPT "/usr/dt/config/tsoljds-migration"

+ 

+static void trim_tcb (Session* session);

+static Window GetPropertyWindow(Display *dpy, Window in_win, Atom atom);

+static Window CreateMotifDragWindow(Display *dpy);

+static void WriteMotifDragWindow(Display *dpy, Window *motifWindow);

+static void SetUpPolyprop (Display *x_dpy);

+static gboolean setPrivForTsol (void);

+int    TsolErrorHandler(Display *dpy, XErrorEvent *error);

+

+struct passwd *pwent = NULL;   /* Password entry for this user */

+int    pipe_fd;        /* Pipe read from dtwm */

+

+void trim_tcb (Session* session)

+{

+  GSList* list;

+  int i;

+  gboolean found = FALSE;

+  list = session->client_list;

+

+  for (; list; list = list->next)

+  {

+    Client* client = (Client*)list->data;

+    GSList* prop_list = client->properties;

+

+      found = FALSE;

+

+      for (; prop_list; prop_list = prop_list->next) {

+        SmProp* prop = (SmProp*)prop_list->data;

+

+	  /* Go through the TCB list, if it is found, remove it */

+          for (i = 0; i < G_N_ELEMENTS(tcb); i++) {

+            if (strcmp (prop->vals->value, tcb[i].name)==0) {

+	      REMOVE ( client->properties, prop);

+	      found = TRUE;

+              break;

+            }

+          }

+	  /* Since the prop for the client has been removed, go on to next */

+	  if (found) break;

+      }

+  }

+}

+

+char *get_desktop_window_atom_name (void)

+{

+  static  char *atom_name = NULL;

+  uid_t uid;

+  zoneid_t zid;

+

+  if (!atom_name) {

+    uid = geteuid ();

+    zid = getzoneid ();

+    atom_name = g_strdup_printf ("NAUTILUS_DESKTOP_WINDOW_%d_%d",

+			    	 uid, zid);

+  }

+  return atom_name;

+}

+

+int

+get_screen_number (char *exec_cmd)

+{

+  gchar **token;

+  int scrnum;

+

+  token = g_strsplit (exec_cmd, ":", 2);

+  if (token[0]) {

+    scrnum = atoi (token[0]);

+    return scrnum;

+  }

+  else return 0;

+}

+

+gchar *

+get_real_command (char *exec_cmd)

+{

+  gchar **token;

+

+  token = g_strsplit (exec_cmd, ":", 2);

+  if (token[1])

+        return (token[1]);

+  else return exec_cmd;

+}

+

+static char * cond( GIOCondition condition)

+{

+  char value[50];

+

+    switch (condition) 

+    {

+      case 1: strcpy (value, "GLIB_SYSDEF_POLLIN");

+		break;

+      case 2: strcpy (value, "GLIB_SYSDEF_POLLPRI");

+		break;

+      case 4: strcpy (value, "GLIB_SYSDEF_POLLOUT");

+		break;

+      case 8: strcpy (value, "GLIB_SYSDEF_POLLERR");

+		break;

+      case 16: strcpy (value, "GLIB_SYSDEF_POLLHUP");

+		break;

+      case 32: strcpy (value, "GLIB_SYSDEF_POLLNVAL");

+		break;

+      default: strcpy (value, "Unknown condition");

+		break;

+    }

+

+    return(value);

+}

+

+static void

+so_long_pipe (gpointer data)

+{

+	/*

+	 * The pipe is bust which probably means the stripe

+	 * has died. So there's nothing to do but die.

+	 */

+	exit (2);

+}

+

+static gboolean handle_pipe_input (GIOChannel *source,

+        			   GIOCondition condition,

+        			   gpointer data)

+{

+#define BUFSIZE 1024

+  gsize byteread, pos;

+  gchar *str;

+  GError *error = NULL;

+  GIOStatus status=0;

+  int screen_num;

+  gchar *real_cmd;

+

+    if (condition & G_IO_ERR)

+		return FALSE;

+

+    if (condition & G_IO_HUP)

+	/* Seems like another good cue to get out of here */

+		return FALSE;

+

+    if (condition & G_IO_IN) {

+      status = g_io_channel_read_line (source, &str, &byteread, &pos, &error);

+

+    switch (status)

+      {

+        case G_IO_STATUS_NORMAL: str[pos] = '\0';

+			screen_num = get_screen_number (str);

+			real_cmd = get_real_command (str);

+			if ((strncmp (real_cmd, "save_yourself", 13) == 0) && (managesession == TRUE))

+			{

+			  write_session (); 

+			}

+			else {

+			  GdkDisplay *gdk_dpy; 

+  			  gdk_dpy = gdk_display_get_default ();

+			  gdk_spawn_command_line_on_screen (gdk_display_get_screen (gdk_dpy, screen_num), real_cmd, &error);

+			}

+      			return TRUE;

+

+    	case G_IO_STATUS_AGAIN: fprintf (stderr, "G_IO_STATUS_AGAIN\n");

+      			return FALSE;

+

+    	case G_IO_STATUS_EOF: 

+      			fprintf (stderr, "G_IO_STATUS_EOF\n");

+      			sleep(1);

+      			return FALSE;

+

+    	case G_IO_STATUS_ERROR:

+      			fprintf (stderr, "G_IO_STATUS_ERROR: %s\n", error->message);

+      			return FALSE;

+	

+    	default: g_assert_not_reached ();

+      			return FALSE;

+    }

+  }

+}

+

+

+int main (int argc, char *argv[])

+{

+  GtkWidget *window, **windows;

+

+  GdkDisplay *gdk_dpy;

+  Display *x_dpy;

+  Window win;

+  gchar *displayname = NULL;

+  gint screen_count;

+  GdkScreen **screen_list;

+  gint i;

+  long myid;

+  GIOChannel *channel;

+  guint result;

+  Session *session;

+  static gboolean first_startup= TRUE;

+

+    /* redirect stdout and stderr to /dev/null */

+    int fd = open ("/dev/null", O_RDWR);

+    dup2 (fd, 1);

+    dup2 (fd, 2);

+

+    /* See if session management is needed */

+    if ((argc > 1) && !(strcmp (argv[1], "--nosession")))

+      managesession = FALSE;

+

+    if ((argc > 1) && !(strcmp (argv[1], "--defaultsession")))

+      default_session = TRUE;

+

+    gsm_keyring_daemon_start ();

+

+    /* This is required some that the ~/.gnome2 are setup */

+    if (managesession)

+      gnome_program_init ("tsoljds-xagent", "0.1", LIBGNOMEUI_MODULE,

+                          argc, argv,

+                          NULL);

+

+    /* Ignore all child deaths */

+    signal(SIGCHLD, SIG_IGN);

+

+	/* Get password entry to use the pw_shell entry later */

+	pwent = getpwuid(getuid());

+

+    if ((pipe_fd = dup(fileno(stdin))) != -1) {

+      int dummy_fd;

+

+        close(fileno(stdin));

+        /* Open /dev/null as stdin */

+        dummy_fd = open("/dev/null", O_RDONLY);

+        /* Set close_on_exec */

+        fcntl(pipe_fd, F_SETFD, 1);

+    } else

+   	pipe_fd = fileno(stdin);

+

+    gtk_init (&argc, &argv); 

+

+    /* Get GdkDisplay and number of screens */

+    gdk_dpy = gdk_display_get_default ();

+    x_dpy =  GDK_DISPLAY_XDISPLAY (gdk_dpy);

+    screen_count =  gdk_display_get_n_screens (gdk_dpy);

+

+    displayname = g_strdup (gdk_display_get_name (gdk_dpy));

+

+    if (screen_count <= 0) {

+      screen_count = 1; /* at least one screen */

+    }

+

+    /* allocation memory for the number of screens */

+    screen_list = g_new (GdkScreen *, screen_count);

+    windows = g_new (GtkWidget *, screen_count);

+    

+    for (i = 0; i < screen_count; i++) {

+      windows[i] = gtk_window_new (GTK_WINDOW_TOPLEVEL);

+      gtk_widget_realize (windows[i]);

+    }

+

+    /* Trap the Xserver error as this is an essential hack to make the program

+     * to start up in the local zone.

+     */

+    XSetErrorHandler(TsolErrorHandler);

+  

+    /* Set to Polyinstantiated properties for selection manager */

+    SetUpPolyprop (x_dpy); 

+  

+    if (managesession == TRUE) {

+    /*

+     * This script is needed to enable input method per zones and roles.

+     * start_session () is shared between gnome-session and tsoljds-xagent

+     * so putting this out of start_session () here.

+     */

+      if (g_file_test (TSOLJDS_MIGRATION_SCRIPT, G_FILE_TEST_IS_EXECUTABLE)) {

+        system (TSOLJDS_MIGRATION_SCRIPT);

+      }

+

+      initialize_ice (); 

+

+      if (session_name == NULL &&

+          g_getenv ("GDM_GNOME_SESSION") != NULL) {

+            session_name = g_strdup (g_getenv ("GDM_GNOME_SESSION"));

+      }

+

+      /* If the session name hasn't been specified from the command line */

+      if(session_name == NULL) {

+        /* If there is no key specified, fall back to the default session */

+        session_name = gnome_config_get_string (CURRENT_SESSION_KEY "=" DEFAULT_SESSION);

+        /* if key was specified but is blank, just use the default */

+        if (!*session_name) {

+          g_free (session_name);

+          session_name = g_strdup (DEFAULT_SESSION);

+        }

+      }

+

+      session = read_session (session_name);

+      trim_tcb (session);  

+      start_session (session); 

+    }

+

+    if (first_startup) {

+      GError *err=NULL;

+	/* FIXME: need to get the screen info some how, but default to 0 for now */

+	gdk_spawn_command_line_on_screen (gdk_display_get_screen (gdk_dpy, 0), g_getenv("LABEL_EXEC_COMMAND"), &err);

+

+	if (err)

+	  g_print ("error is %s\n", err->message);

+

+ 	first_startup = FALSE;

+    }

+

+    channel = g_io_channel_unix_new (pipe_fd);

+    result = g_io_add_watch_full (channel, G_PRIORITY_HIGH, 

+		                  G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP,

+                                  (GIOFunc)handle_pipe_input, NULL, so_long_pipe);

+    gtk_main ();

+

+    gsm_keyring_daemon_stop ();

+  

+    return 0;

+}

+

+static void SetUpPolyprop (Display *x_dpy)

+{

+  /* copy motif_proxy_win from user's clearance to current label */

+#define ROOT_UID        0

+  XTsolResAttributes resattr;

+  Atom ATOM_MOTIF_DRAG_WIN;

+  Atom ATOM_MOTIF_PROXY_WIN;

+  m_label_t *slabel;

+  Window motif_drag_win = None;

+  Window proxy_win = None;

+  XWindowAttributes wattr;

+

+    /* Set up to look up the polyprop used by the sel_mgr */

+    slabel = blabel_alloc();

+    bsllow(slabel);

+    resattr.sl = slabel;

+    resattr.uid = ROOT_UID;

+    XTSOLsetPolyInstInfo(x_dpy, resattr.sl, (uid_t *)(&resattr.uid), True);

+    ATOM_MOTIF_DRAG_WIN = XInternAtom(x_dpy, _XA_MOTIF_WINDOW, False);

+    ATOM_MOTIF_PROXY_WIN = XInternAtom(x_dpy, _XA_MOTIF_PROXY_WINDOW, False);

+    motif_drag_win = GetPropertyWindow(x_dpy, DefaultRootWindow(x_dpy),

+        			       ATOM_MOTIF_DRAG_WIN);

+    if (motif_drag_win != None) {

+      proxy_win = GetPropertyWindow(x_dpy, motif_drag_win, 

+				    ATOM_MOTIF_PROXY_WIN);

+    }

+

+    /* put back our original polyprop settings */

+    getplabel(slabel);

+    resattr.uid = getuid();

+    XTSOLsetPolyInstInfo(x_dpy, resattr.sl, (uid_t *)(&resattr.uid), False);

+    blabel_free(slabel);

+

+    motif_drag_win = GetPropertyWindow(x_dpy, DefaultRootWindow(x_dpy),

+                             	       ATOM_MOTIF_DRAG_WIN);

+

+    /* Validate motif_drag_win */

+    if (XGetWindowAttributes(x_dpy, motif_drag_win, &wattr) == 0) {

+      /* if window is invalid, create a new one */

+      motif_drag_win = CreateMotifDragWindow(x_dpy);

+    }

+

+    if (motif_drag_win != None) {

+      XChangeProperty(x_dpy, motif_drag_win, ATOM_MOTIF_PROXY_WIN,

+                      XA_WINDOW, 32, PropModeReplace, 

+                      (unsigned char *) &proxy_win, 1);

+    }

+}

+

+Window

+GetPropertyWindow(Display *dpy, Window in_win, Atom atom)

+{

+  Atom            type;

+  int             format;

+  unsigned long   lengthRtn;

+  unsigned long   bytesafter;