diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2008-11-15 03:12:16 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2008-11-15 03:12:16 +0000 |
| commit | d0b974fc52d7c9cb37e1d7edeab23c9dd21b2146 (patch) | |
| tree | 84bddd035fe680355d562cea99126954914d6079 | |
| parent | 2968631094824780a21fa8d66deac4651feefa95 (diff) | |
| download | gdm-d0b974fc52d7c9cb37e1d7edeab23c9dd21b2146.tar.gz | |
Modify the gdm_ensure_sanity function so that it does nothing on Solaris.
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.
svn path=/branches/gnome-2-20/; revision=6597
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | daemon/misc.c | 10 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,10 @@ +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. + 2008-10-23 Brian Cameron <brian.cameron@sun.com> * daemon/gdm.c: Move call to gdm_final_cleanup after accessing diff --git a/daemon/misc.c b/daemon/misc.c index 31afc8ea..00790d1c 100644 --- a/daemon/misc.c +++ b/daemon/misc.c @@ -874,7 +874,11 @@ ensure_tmp_socket_dir (const char *dir) * 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 @@ gdm_ensure_sanity (void) uid_t old_euid; gid_t old_egid; +#ifdef __sun + return; +#endif + old_euid = geteuid (); old_egid = getegid (); |