80 lines
4.2 KiB
Diff
80 lines
4.2 KiB
Diff
diff -upr gdm-2.23.92-pre/daemon/gdm-display-access-file.c gdm-2.23.92-post/daemon/gdm-display-access-file.c
|
|
--- gdm-2.23.92-pre/daemon/gdm-display-access-file.c 2008-08-26 14:04:00.000000000 -0500
|
|
+++ gdm-2.23.92-post/daemon/gdm-display-access-file.c 2008-10-07 22:58:45.000000000 -0500
|
|
@@ -410,7 +410,7 @@ _get_auth_info_for_display (GdmDisplayAc
|
|
|
|
if (is_local) {
|
|
*family = FamilyLocal;
|
|
- *address = g_strdup (g_get_host_name ());
|
|
+ *address = g_strdup ("localhost");
|
|
} else {
|
|
*family = FamilyWild;
|
|
gdm_display_get_remote_hostname (display, address, NULL);
|
|
Only in gdm-2.23.92-post/daemon: gdm-display-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-factory-slave-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-local-display-factory-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-manager-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-product-display-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-product-slave-glue.h
|
|
diff -upr gdm-2.23.92-pre/daemon/gdm-session-direct.c gdm-2.23.92-post/daemon/gdm-session-direct.c
|
|
--- gdm-2.23.92-pre/daemon/gdm-session-direct.c 2008-08-26 14:04:00.000000000 -0500
|
|
+++ gdm-2.23.92-post/daemon/gdm-session-direct.c 2008-10-07 22:58:45.000000000 -0500
|
|
@@ -1985,6 +1985,12 @@ setup_session_environment (GdmSessionDir
|
|
session->priv->user_x11_authority_file);
|
|
}
|
|
|
|
+ if (session->priv->display_is_local) {
|
|
+ gdm_session_direct_set_environment_variable (session,
|
|
+ "XAUTHLOCALHOSTNAME",
|
|
+ "localhost");
|
|
+ }
|
|
+
|
|
/* FIXME: We do this here and in the session worker. We should consolidate
|
|
* somehow.
|
|
*/
|
|
Only in gdm-2.23.92-post/daemon: gdm-session-direct-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-simple-slave-glue.h
|
|
diff -upr gdm-2.23.92-pre/daemon/gdm-slave.c gdm-2.23.92-post/daemon/gdm-slave.c
|
|
--- gdm-2.23.92-pre/daemon/gdm-slave.c 2008-08-26 14:04:00.000000000 -0500
|
|
+++ gdm-2.23.92-post/daemon/gdm-slave.c 2008-10-07 22:58:45.000000000 -0500
|
|
@@ -220,6 +220,10 @@ get_script_environment (GdmSlave *slav
|
|
g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname));
|
|
}
|
|
|
|
+ if (slave->priv->display_is_local) {
|
|
+ g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost"));
|
|
+ }
|
|
+
|
|
/* Runs as root */
|
|
g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file));
|
|
g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name));
|
|
@@ -372,6 +376,7 @@ gdm_slave_connect_to_x11_display (GdmSla
|
|
|
|
g_setenv ("DISPLAY", slave->priv->display_name, TRUE);
|
|
g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE);
|
|
+ g_setenv ("XAUTHLOCALHOSTNAME", "localhost", TRUE);
|
|
|
|
sigemptyset (&mask);
|
|
sigaddset (&mask, SIGCHLD);
|
|
Only in gdm-2.23.92-post/daemon: gdm-slave-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-static-display-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-static-factory-display-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-transient-display-glue.h
|
|
diff -upr gdm-2.23.92-pre/daemon/gdm-welcome-session.c gdm-2.23.92-post/daemon/gdm-welcome-session.c
|
|
--- gdm-2.23.92-pre/daemon/gdm-welcome-session.c 2008-09-08 17:09:05.000000000 -0500
|
|
+++ gdm-2.23.92-post/daemon/gdm-welcome-session.c 2008-10-07 22:58:45.000000000 -0500
|
|
@@ -315,6 +315,10 @@ get_welcome_environment (GdmWelcomeSessi
|
|
g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell));
|
|
}
|
|
|
|
+ if (welcome_session->priv->x11_display_is_local) {
|
|
+ g_hash_table_remove (hash, "XAUTHLOCALHOSTNAME");
|
|
+ g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost"));
|
|
+ }
|
|
|
|
g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
|
|
|
|
Only in gdm-2.23.92-post/daemon: gdm-xdmcp-chooser-display-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-xdmcp-chooser-slave-glue.h
|
|
Only in gdm-2.23.92-post/daemon: gdm-xdmcp-greeter-display-glue.h
|