gdm r6137 - in trunk: . daemon data

[halfline svn gnome org]

Author: halfline
Date: Tue Apr  8 17:10:03 2008
New Revision: 6137
URL: http://svn.gnome.org/viewvc/gdm?rev=6137&view=rev

Log:
2008-04-08 Ray Strode <rstrode redhat com>

	* configure.ac
	* data/Makefile.am:
	* daemon/Makefile.am:
	* daemon/gdm-display-access-file.c
	(_create_xauth_file_for_user)
	Store X auth password in /var/run/gdm instead of /tmp


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/daemon/Makefile.am
   trunk/daemon/gdm-display-access-file.c
   trunk/data/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Apr  8 17:10:03 2008
@@ -1247,6 +1247,20 @@
 AC_SUBST(GDM_WORKING_DIR)
 
 dnl ---------------------------------------------------------------------------
+dnl - Directory for X auth cookies
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_WITH(xauth-dir,    [  --with-xauth-dir=<dir> xauth cookie directory])
+
+if ! test -z "$with_xauth_dir"; then
+   GDM_XAUTH_DIR=$with_xauth_dir
+else
+   GDM_XAUTH_DIR=${localstatedir}/run/gdm
+fi
+
+AC_SUBST(GDM_XAUTH_DIR)
+
+dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
 

Modified: trunk/daemon/Makefile.am
==============================================================================
--- trunk/daemon/Makefile.am	(original)
+++ trunk/daemon/Makefile.am	Tue Apr  8 17:10:03 2008
@@ -16,6 +16,7 @@
 	-DPIXMAPDIR=\"$(pixmapdir)\"			\
 	-DSBINDIR=\"$(sbindir)\"			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\"		\
 	-DGDM_DEFAULTS_CONF=\"$(GDM_DEFAULTS_CONF)\"	\
 	-DGDM_CUSTOM_CONF=\"$(GDM_CUSTOM_CONF)\"	\
 	-DGDM_OLD_CONF=\"$(GDM_OLD_CONF)\"		\

Modified: trunk/daemon/gdm-display-access-file.c
==============================================================================
--- trunk/daemon/gdm-display-access-file.c	(original)
+++ trunk/daemon/gdm-display-access-file.c	Tue Apr  8 17:10:03 2008
@@ -220,7 +220,6 @@
                              GError     **error)
 {
         char   *template;
-        GError *open_error;
         int     fd;
         FILE   *fp;
         uid_t   uid;
@@ -228,14 +227,19 @@
 
         fp = NULL;
 
-        template = g_strdup_printf (".gdm-xauth-%s.XXXXXX", username);
-
-        open_error = NULL;
-        fd = g_file_open_tmp (template, filename, &open_error);
-        g_free (template);
+        template = g_strdup_printf (GDM_XAUTH_DIR
+                                    "/auth-cookie-XXXXXXXX-for-%s",
+                                    username);
+
+        fd = g_mkstemp (template);
+        *filename = template;
+        template = NULL;
 
         if (fd < 0) {
-                g_propagate_error (error, open_error);
+                g_set_error (error,
+                             G_FILE_ERROR,
+                             g_file_error_from_errno (errno),
+                             "%s", g_strerror (errno));
                 goto out;
         }
 

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Apr  8 17:10:03 2008
@@ -11,6 +11,7 @@
 predir = $(gdmconfdir)/PreSession
 postlogindir = $(gdmconfdir)/PostLogin
 workingdir = $(GDM_WORKING_DIR)
+xauthdir = $(GDM_XAUTH_DIR)
 
 Xsession: $(srcdir)/Xsession.in
 	sed	-e 's,[ ]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \
@@ -114,7 +115,8 @@
 	$(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin \
 	$(DESTDIR)$(workingdir)/.gconf.path \
 	-rf \
-	$(DESTDIR)$(workingdir)/.gconf.mandatory
+	$(DESTDIR)$(workingdir)/.gconf.mandatory \
+	$(DESTDIR)$(xauthdir)
 
 install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
 	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
@@ -190,6 +192,12 @@
 	   fi; \
 	fi
 
+	if test '!' -d $(DESTDIR)$(xauthdir); then \
+		$(mkinstalldirs) $(DESTDIR)$(xauthdir); \
+		chmod 1770 $(DESTDIR)$(xauthdir); \
+		chown root:gdm $(DESTDIR)$(xauthdir) || : ; \
+	fi
+
 	if test '!' -d $(DESTDIR)$(workingdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(workingdir); \
 		chmod 1770 $(DESTDIR)$(workingdir); \