76de0e7e7f
Copy from GNOME:Factory/gdm based on submit request 21201 from user vuntz OBS-URL: https://build.opensuse.org/request/show/21201 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=82
76 lines
3.3 KiB
Diff
76 lines
3.3 KiB
Diff
Index: gdm-2.27.90/daemon/gdm-display-access-file.c
|
|
===================================================================
|
|
--- gdm-2.27.90.orig/daemon/gdm-display-access-file.c
|
|
+++ gdm-2.27.90/daemon/gdm-display-access-file.c
|
|
@@ -440,11 +440,15 @@ _get_auth_info_for_display (GdmDisplayAc
|
|
if (is_local) {
|
|
char localhost[HOST_NAME_MAX + 1] = "";
|
|
*family = FamilyLocal;
|
|
+#if 0
|
|
if (gethostname (localhost, HOST_NAME_MAX) == 0) {
|
|
*address = g_strdup (localhost);
|
|
} else {
|
|
+#endif
|
|
*address = g_strdup ("localhost");
|
|
+#if 0
|
|
}
|
|
+#endif
|
|
} else {
|
|
*family = FamilyWild;
|
|
gdm_display_get_remote_hostname (display, address, NULL);
|
|
Index: gdm-2.27.90/daemon/gdm-session-direct.c
|
|
===================================================================
|
|
--- gdm-2.27.90.orig/daemon/gdm-session-direct.c
|
|
+++ gdm-2.27.90/daemon/gdm-session-direct.c
|
|
@@ -2050,6 +2050,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.
|
|
*/
|
|
Index: gdm-2.27.90/daemon/gdm-slave.c
|
|
===================================================================
|
|
--- gdm-2.27.90.orig/daemon/gdm-slave.c
|
|
+++ gdm-2.27.90/daemon/gdm-slave.c
|
|
@@ -222,6 +222,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));
|
|
@@ -374,6 +378,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);
|
|
Index: gdm-2.27.90/daemon/gdm-welcome-session.c
|
|
===================================================================
|
|
--- gdm-2.27.90.orig/daemon/gdm-welcome-session.c
|
|
+++ gdm-2.27.90/daemon/gdm-welcome-session.c
|
|
@@ -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")));
|
|
|