diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-07-21 16:16:04 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-07-21 16:16:04 +0000 |
| commit | 968dc5d3899719473f3339ffac072c9c96baa27b (patch) | |
| tree | 73d31dad4daf83e7b08766fe9911f62af3dd3ceb /daemon/gdm-display-access-file.c | |
| parent | 51c6b49401a9b4a622afcf72ce7ff40d58f707e9 (diff) | |
| download | gdm-968dc5d3899719473f3339ffac072c9c96baa27b.tar.gz | |
Fix xauth dir permissions if it exists.
2008-07-21 William Jon McCann <jmccann@redhat.com>
* daemon/gdm-display-access-file.c (_create_xauth_file_for_user):
Fix xauth dir permissions if it exists.
* utils/Makefile.am:
* utils/gdm-screenshot.c (screenshot_save), (prepare_screenshot):
Write gdm screenshot output to /var/run/gdm instead of /tmp.
svn path=/trunk/; revision=6314
Diffstat (limited to 'daemon/gdm-display-access-file.c')
| -rw-r--r-- | daemon/gdm-display-access-file.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c index 5146b906..a74b7400 100644 --- a/daemon/gdm-display-access-file.c +++ b/daemon/gdm-display-access-file.c @@ -227,7 +227,7 @@ _create_xauth_file_for_user (const char *username, fp = NULL; - /* Create directory if not exist, then set permission 01775 and ownership root:gdm */ + /* Create directory if not exist, then set permission 01775 and ownership root:gdm */ if (g_file_test (GDM_XAUTH_DIR, G_FILE_TEST_IS_DIR) == FALSE) { g_unlink (GDM_XAUTH_DIR); if (g_mkdir (GDM_XAUTH_DIR, S_ISVTX|S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH) != 0) { @@ -242,8 +242,11 @@ _create_xauth_file_for_user (const char *username, g_chmod (GDM_XAUTH_DIR, S_ISVTX|S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH); _get_uid_and_gid_for_user ("gdm", &uid, &gid); chown (GDM_XAUTH_DIR, 0, gid); + } else { + /* if it does exist make sure it has correct mode */ + g_chmod (GDM_XAUTH_DIR, S_ISVTX|S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH); } - + template = g_strdup_printf (GDM_XAUTH_DIR "/auth-cookie-XXXXXXXX-for-%s", username); |