gdm r6597 - in branches/gnome-2-20: . daemon

[bcameron svn gnome org]

Author: bcameron
Date: Sat Nov 15 03:12:16 2008
New Revision: 6597
URL: http://svn.gnome.org/viewvc/gdm?rev=6597&view=rev

Log:
2008-11-14 Brian Cameron <brian cameron sun com>

        * daemon/misc.c: Modify the gdm_ensure_sanity function so that it
          does nothing on Solaris.  Solaris Trusted Extensions has different
          assumptions about how sockets should be set up, and it's better for
          GDM to not second-guess this.


Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/daemon/misc.c

Modified: branches/gnome-2-20/daemon/misc.c
==============================================================================
--- branches/gnome-2-20/daemon/misc.c	(original)
+++ branches/gnome-2-20/daemon/misc.c	Sat Nov 15 03:12:16 2008
@@ -874,7 +874,11 @@
  * Done on startup and when running display_manage
  * This can do some sanity ensuring, one of the things it does now is make
  * sure /tmp/.ICE-unix and /tmp/.X11-unix exist and have the correct
- * permissions
+ * permissions.
+ *
+ * Do nothing on Solaris since this logic breaks Trusted Extensions, and
+ * the Solaris X permissions model (socket & pipe directories only writable
+ * by gid-root), and it ignores the Solaris /tmp/.X11-pipe directory.
  */
 void
 gdm_ensure_sanity (void)
@@ -882,6 +886,10 @@
 	uid_t old_euid;
 	gid_t old_egid;
 
+#ifdef __sun
+	return;
+#endif
+
 	old_euid = geteuid ();
 	old_egid = getegid ();