This is a patch to fix TJDS on Sunray,
6515776 uttscwrap not working with normal user on TX
The problem is that gnome-keyring-daemon was not started up in labeled
zone, so the fix
is to start up gnome-keyring-daemon by tsoljds-xagent. So change
Makefile.am to include
gsm-keyring.[ch] and the actual call in tsoljds-xagent.c
Apology for the badly formatted patch. But I think the diff is small
enough to be excused.
---- gnome-session-2.16.1/gnome-session/Makefile.am 2006-11-03
11:51:16.494053000 +0000
-+++
../SUNWtgnome-xagent-2.16.1.hacked/gnome-session-2.16.1/gnome-session/Makefile.am
2006-11-03 11:43:57.016588000 +0000
+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
@@ -49,6 +49,8 @@
+ remote.h \
+ ice.c \
+ ice.h \
++ gsm-keyring.c \
++ gsm-keyring.h \
+ splash-widget.c \
+ splash-widget.h \
+ logout.c \
@@ -75,10 +77,10 @@
gnome_session_save_SOURCES = \
save-session.c \
gsm-typebuiltins.c \
-diff -urN gnome-session-2.16.1/gnome-session/tsoljds-xagent.c
../SUNWtgnome-xagent-2.16.1.hacked/gnome-session-2.16.1/gnome-se
ssion/tsoljds-xagent.c
---- gnome-session-2.16.1/gnome-session/tsoljds-xagent.c
1970-01-01 00:00:00.000000000 +0000
-+++
../SUNWtgnome-xagent-2.16.1.hacked/gnome-session-2.16.1/gnome-session/tsoljds-xagent.c
2006-11-03 11:47:40.815778000 +
0000
-@@ -0,0 +1,502 @@
+diff -urN -x'*~' gnome-session-2.18.0/gnome-session/tsoljds-xagent.c
../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/g
nome-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
+
@@ -118,6 +120,7 @@
+#include "ice.h"
+#include "headers.h"
+#include "save.h"
++#include "gsm-keyring.h"
+
+gint purge_delay = 30000;
+gint warn_delay = 30000;
@@ -354,6 +357,8 @@
+ 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,
@@ -456,6 +461,8 @@
+ 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;
+}
