gdm r6314 - in trunk: . daemon utils

[mccann svn gnome org]

Author: mccann
Date: Mon Jul 21 16:16:04 2008
New Revision: 6314
URL: http://svn.gnome.org/viewvc/gdm?rev=6314&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-display-access-file.c
   trunk/utils/Makefile.am
   trunk/utils/gdm-screenshot.c

Modified: trunk/daemon/gdm-display-access-file.c
==============================================================================
--- trunk/daemon/gdm-display-access-file.c	(original)
+++ trunk/daemon/gdm-display-access-file.c	Mon Jul 21 16:16:04 2008
@@ -227,7 +227,7 @@
 
         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 @@
                 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);

Modified: trunk/utils/Makefile.am
==============================================================================
--- trunk/utils/Makefile.am	(original)
+++ trunk/utils/Makefile.am	Mon Jul 21 16:16:04 2008
@@ -3,6 +3,7 @@
 INCLUDES = \
 	-I.						\
 	-I..						\
+	-DLOCALSTATEDIR=\""$(localstatedir)"\" 		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
 	$(UTILS_CFLAGS)					\
 	$(GTK_CFLAGS)					\

Modified: trunk/utils/gdm-screenshot.c
==============================================================================
--- trunk/utils/gdm-screenshot.c	(original)
+++ trunk/utils/gdm-screenshot.c	Mon Jul 21 16:16:04 2008
@@ -158,11 +158,14 @@
 static char *
 screenshot_save (GdkPixbuf *pixbuf)
 {
-        char    *filename;
-        gboolean res;
-        GError  *error;
+        char       *filename;
+        gboolean    res;
+        GError     *error;
+        const char *save_dir;
 
-        filename = g_build_filename (g_get_tmp_dir (),
+        save_dir = LOCALSTATEDIR "/run/gdm";
+
+        filename = g_build_filename (save_dir,
                                      "GDM-Screenshot.png",
                                      NULL);
 
@@ -206,10 +209,11 @@
         }
 
         filename = screenshot_save (screenshot);
-        g_print ("Wrote %s\n", filename);
-        /* FIXME: show a dialog or something */
-
-        g_free (filename);
+        if (filename != NULL) {
+                g_print ("Wrote %s\n", filename);
+                /* FIXME: show a dialog or something */
+                g_free (filename);
+        }
 }
 
 int