gdm r6408 - in trunk: . daemon data

[mccann svn gnome org]

Author: mccann
Date: Thu Aug 21 15:26:49 2008
New Revision: 6408
URL: http://svn.gnome.org/viewvc/gdm?rev=6408&view=rev

Log:
2008-08-21  William Jon McCann  <jmccann redhat com>

	* daemon/gdm-display-access-file.c (_create_xauth_file_for_user):
	* data/Makefile.am:
	* data/gdm.schemas.in.in:
	A few more fixes to allow the gdm greeter username to be
	configured at build time.
	Patch from Patryk Zawadzki <patrys pld-linux org>
	Fixes #504565



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

Modified: trunk/daemon/gdm-display-access-file.c
==============================================================================
--- trunk/daemon/gdm-display-access-file.c	(original)
+++ trunk/daemon/gdm-display-access-file.c	Thu Aug 21 15:26:49 2008
@@ -254,7 +254,7 @@
                 }
 
                 g_chmod (GDM_XAUTH_DIR, S_ISVTX | S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-                _get_uid_and_gid_for_user ("gdm", &uid, &gid);
+                _get_uid_and_gid_for_user (GDM_USERNAME, &uid, &gid);
                 if (chown (GDM_XAUTH_DIR, 0, gid) != 0) {
                         g_warning ("Unable to change owner of '%s'",
                                    GDM_XAUTH_DIR);

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Aug 21 15:26:49 2008
@@ -55,6 +55,8 @@
 	sed	-e 's,[ ]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
 		-e 's,[ ]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
 		-e 's,[ ]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \
+		-e 's,[ ]GDM_USERNAME[@],$(GDM_USERNAME),g' \
+		-e 's,[ ]GDM_GROUPNAME[@],$(GDM_GROUPNAME),g' \
 		-e 's,[ ]HALT_COMMAND[@],$(HALT_COMMAND),g' \
 		-e 's,[ ]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \
 		-e 's,[ ]SOUND_PROGRAM[@],$(SOUND_PROGRAM),g' \

Modified: trunk/data/gdm.schemas.in.in
==============================================================================
--- trunk/data/gdm.schemas.in.in	(original)
+++ trunk/data/gdm.schemas.in.in	Thu Aug 21 15:26:49 2008
@@ -4,12 +4,12 @@
     <schema>
       <key>daemon/User</key>
       <signature>s</signature>
-      <default>gdm</default>
+      <default>@GDM_USERNAME@</default>
     </schema>
     <schema>
       <key>daemon/Group</key>
       <signature>s</signature>
-      <default>gdm</default>
+      <default>@GDM_GROUPNAME@</default>
     </schema>
     <schema>
       <key>daemon/TimedLoginEnable</key>