gdm r6395 - in trunk: . daemon data gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Wed Aug 20 00:23:50 2008
New Revision: 6395
URL: http://svn.gnome.org/viewvc/gdm?rev=6395&view=rev

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

	* configure.ac:
	* daemon/gdm-chooser-server.c (gdm_chooser_server_class_init):
	* daemon/gdm-display.c (gdm_display_real_create_authority):
	* daemon/gdm-factory-slave.c (run_greeter):
	* daemon/gdm-greeter-server.c (gdm_greeter_server_class_init):
	* daemon/gdm-simple-slave.c (on_session_accredited), (run_greeter):
	* daemon/gdm-welcome-session.c (gdm_welcome_session_class_init):
	* daemon/gdm-xdmcp-chooser-slave.c (run_chooser):
	* data/Makefile.am:
	* gui/simple-greeter/gdm-user-manager.c:
	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/configure.ac
   trunk/daemon/gdm-chooser-server.c
   trunk/daemon/gdm-display.c
   trunk/daemon/gdm-factory-slave.c
   trunk/daemon/gdm-greeter-server.c
   trunk/daemon/gdm-simple-slave.c
   trunk/daemon/gdm-welcome-session.c
   trunk/daemon/gdm-xdmcp-chooser-slave.c
   trunk/data/Makefile.am
   trunk/gui/simple-greeter/gdm-user-manager.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Aug 20 00:23:50 2008
@@ -445,6 +445,34 @@
 fi
 AC_MSG_RESULT($fstype)
 
+dnl GDM user
+withval=""
+AC_ARG_WITH(user,
+            AS_HELP_STRING([--with-user=<username>],
+                           [specify gdm's user name]))
+
+if test x$withval != x; then
+	GDM_USERNAME="$withval"
+else
+	GDM_USERNAME=gdm
+fi
+AC_SUBST(GDM_USERNAME)
+AC_DEFINE_UNQUOTED([GDM_USERNAME], "$GDM_USERNAME", [User to use])
+
+dnl GDM group
+withval=""
+AC_ARG_WITH(group,
+            AS_HELP_STRING([--with-group=<username>],
+                           [specify gdm's user name]))
+
+if test x$withval != x; then
+	GDM_GROUPNAME="$withval"
+else
+	GDM_GROUPNAME=gdm
+fi
+AC_SUBST(GDM_GROUPNAME)
+AC_DEFINE_UNQUOTED([GDM_GROUPNAME], "$GDM_GROUPNAME", [Group to use])
+
 
 dnl ---------------------------------------------------------------------------
 dnl - Check for PAM stuff
@@ -1415,6 +1443,7 @@
 gui/simple-chooser/Makefile
 gui/user-switch-applet/Makefile
 utils/Makefile
+data/gdm.conf
 data/Makefile
 data/faces/Makefile
 data/pixmaps/Makefile
@@ -1452,6 +1481,9 @@
 	cflags:		          ${CFLAGS}
         Maintainer mode:          ${USE_MAINTAINER_MODE}
 
+        user:                     ${GDM_USERNAME}
+        group:                    ${GDM_GROUPNAME}
+
         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
         PAM prefix:               ${PAM_PREFIX}
         X server:                 ${X_SERVER}

Modified: trunk/daemon/gdm-chooser-server.c
==============================================================================
--- trunk/daemon/gdm-chooser-server.c	(original)
+++ trunk/daemon/gdm-chooser-server.c	Wed Aug 20 00:23:50 2008
@@ -552,14 +552,14 @@
                                          g_param_spec_string ("user-name",
                                                               "user name",
                                                               "user name",
-                                                              "gdm",
+                                                              GDM_USERNAME,
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
         g_object_class_install_property (object_class,
                                          PROP_GROUP_NAME,
                                          g_param_spec_string ("group-name",
                                                               "group name",
                                                               "group name",
-                                                              "gdm",
+                                                              GDM_GROUPNAME,
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
         signals [HOSTNAME_SELECTED] =
                 g_signal_new ("hostname-selected",

Modified: trunk/daemon/gdm-display.c
==============================================================================
--- trunk/daemon/gdm-display.c	(original)
+++ trunk/daemon/gdm-display.c	Wed Aug 20 00:23:50 2008
@@ -161,7 +161,7 @@
         g_return_val_if_fail (display->priv->access_file == NULL, FALSE);
 
         error = NULL;
-        access_file = _create_access_file_for_user (display, "gdm", &error);
+        access_file = _create_access_file_for_user (display, GDM_USERNAME, &error);
 
         if (access_file == NULL) {
                 g_critical ("could not create display access file: %s", error->message);

Modified: trunk/daemon/gdm-factory-slave.c
==============================================================================
--- trunk/daemon/gdm-factory-slave.c	(original)
+++ trunk/daemon/gdm-factory-slave.c	Wed Aug 20 00:23:50 2008
@@ -489,7 +489,7 @@
         /* FIXME: send a signal back to the master */
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
 
         slave->priv->greeter_server = gdm_greeter_server_new (display_id);
         g_signal_connect (slave->priv->greeter_server,

Modified: trunk/daemon/gdm-greeter-server.c
==============================================================================
--- trunk/daemon/gdm-greeter-server.c	(original)
+++ trunk/daemon/gdm-greeter-server.c	Wed Aug 20 00:23:50 2008
@@ -1113,14 +1113,14 @@
                                          g_param_spec_string ("user-name",
                                                               "user name",
                                                               "user name",
-                                                              "gdm",
+                                                              GDM_USERNAME,
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
         g_object_class_install_property (object_class,
                                          PROP_GROUP_NAME,
                                          g_param_spec_string ("group-name",
                                                               "group name",
                                                               "group name",
-                                                              "gdm",
+                                                              GDM_GROUPNAME,
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
         signals [BEGIN_VERIFICATION] =
                 g_signal_new ("begin-verification",

Modified: trunk/daemon/gdm-simple-slave.c
==============================================================================
--- trunk/daemon/gdm-simple-slave.c	(original)
+++ trunk/daemon/gdm-simple-slave.c	Wed Aug 20 00:23:50 2008
@@ -367,7 +367,7 @@
         queue_start_session (slave);
 
         /* Run the PostLogin script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", GDM_USERNAME);
 }
 
 static void
@@ -855,7 +855,7 @@
         }
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
 
         create_new_session (slave);
 

Modified: trunk/daemon/gdm-welcome-session.c
==============================================================================
--- trunk/daemon/gdm-welcome-session.c	(original)
+++ trunk/daemon/gdm-welcome-session.c	Wed Aug 20 00:23:50 2008
@@ -1122,14 +1122,14 @@
                                          g_param_spec_string ("user-name",
                                                               "user name",
                                                               "user name",
-                                                              "gdm",
+                                                              GDM_USERNAME,
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
         g_object_class_install_property (object_class,
                                          PROP_GROUP_NAME,
                                          g_param_spec_string ("group-name",
                                                               "group name",
                                                               "group name",
-                                                              "gdm",
+                                                              GDM_GROUPNAME,
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
         g_object_class_install_property (object_class,
                                          PROP_SERVER_ADDRESS,

Modified: trunk/daemon/gdm-xdmcp-chooser-slave.c
==============================================================================
--- trunk/daemon/gdm-xdmcp-chooser-slave.c	(original)
+++ trunk/daemon/gdm-xdmcp-chooser-slave.c	Wed Aug 20 00:23:50 2008
@@ -190,7 +190,7 @@
         }
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
 
         slave->priv->chooser_server = gdm_chooser_server_new (display_id);
         g_signal_connect (slave->priv->chooser_server,

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Aug 20 00:23:50 2008
@@ -34,7 +34,8 @@
 		<$(srcdir)/gdm.conf-custom.in >gdm.conf-custom
 
 dbusconfdir = $(DBUS_SYS_DIR)
-dbusconf_DATA = gdm.conf
+dbusconf_in_files = gdm.conf.in
+dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
 
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -72,7 +73,7 @@
 EXTRA_DIST =			\
 	$(schemas_in_files)	\
 	$(schemas_DATA)		\
-	$(dbusconf_DATA)	\
+	$(dbusconf_in_files)	\
 	gdm.schemas.in.in	\
 	gdm.conf-custom.in 	\
 	Xsession.in 		\
@@ -95,6 +96,7 @@
 	$(NULL)
 
 DISTCLEANFILES =			\
+	$(dbusconf_DATA)			\
 	gdm.schemas			\
 	$(NULL)
 

Modified: trunk/gui/simple-greeter/gdm-user-manager.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-user-manager.c	(original)
+++ trunk/gui/simple-greeter/gdm-user-manager.c	Wed Aug 20 00:23:50 2008
@@ -89,7 +89,7 @@
                                   "uucp",       \
                                   "operator",   \
                                   "nobody",     \
-                                  "gdm",        \
+                                  GDM_USERNAME, \
                                   "postgres",   \
                                   "pvm",        \
                                   "rpm",        \