--- a/ChangeLog	Thu Jun 17 13:42:39 2010 +0000
+++ b/ChangeLog	Thu Jun 17 14:22:57 2010 +0000
@@ -1,3 +1,8 @@
+2010-06-17 Arvind Umrao  <[email protected]>
+
+        * xscreensaver-13-trusted.diff: Updated
+        * CR 6955133, screensaver IDLECMD in policy.conf does not work with TJDS and ldap users
+
 2010-06-17 Erwann Chenede - <[email protected]>
 
 	* specs/SUNWgtk2.spec : removed SUNWgir-repository dep 

--- a/patches/xscreensaver-13-trusted.diff	Thu Jun 17 13:42:39 2010 +0000
+++ b/patches/xscreensaver-13-trusted.diff	Thu Jun 17 14:22:57 2010 +0000
@@ -353,20 +353,6 @@
    if (getuid () == 0)
      return;  /* Dont let hacks run if logged in as root*/
  
-@@ -1084,6 +1108,13 @@ spawn_screenhack (saver_screen_info *ssi)
-                                              strlen (HACK_PATH));
-       sprintf(complete_hack_command, HACK_PATH"/%s", hack->command);
- 
-+      if (tsol_is_multi_label_session())
-+        if (p->lock_cmd == LOGOUT_CMD)
-+          {
-+            free (complete_hack_command);
-+            exec_command (p->shell, "/usr/bin/pkill gnome-session", 0);
-+            exit(1);
-+          }
- 
-       forked = fork_and_exec (ssi, complete_hack_command);
-       free (complete_hack_command);
 diff --git xscreensaver-5.11/driver/trusted-utils.c xscreensaver-5.11/driver/trusted-utils.c
 new file mode 100644
 --- /dev/null

--- a/specs/SUNWxscreensaver.spec	Thu Jun 17 13:42:39 2010 +0000
+++ b/specs/SUNWxscreensaver.spec	Thu Jun 17 14:22:57 2010 +0000
@@ -614,7 +614,7 @@
 %endif
 
 %changelog
-* Wed Jun 16 2010 - [email protected]
+* Thu Jun 17 2010 - [email protected]
 - Updated xscreensaver-13-trusted.diff to fix CR 6955133
 * Tue Jun 15 2010 - [email protected]
 - Make 'asterisks' setting in xscreensaver app-defaults file work, restore