File gdm-xauthlocalhostname.patch of Package gdm
Index: gdm-45.0.1/common/gdm-common.c
===================================================================
--- gdm-45.0.1.orig/common/gdm-common.c
+++ gdm-45.0.1/common/gdm-common.c
@@ -623,6 +623,8 @@ gdm_get_script_environment (const char *
if (display_hostname) {
g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (display_hostname));
+ } else {
+ g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), gdm_gethostname ());
}
/* Runs as root */
@@ -1088,3 +1090,14 @@ gdm_load_env_d (GdmLoadEnvVarFunc load_e
gdm_load_env_dir (dir, load_env_func, expand_func, user_data);
g_object_unref (dir);
}
+
+char *
+gdm_gethostname (void)
+{
+ char localhost[HOST_NAME_MAX + 1] = "";
+ if (gethostname (localhost, HOST_NAME_MAX) == 0) {
+ return g_strdup (localhost);
+ } else {
+ return g_strdup ("localhost");
+ }
+}
Index: gdm-45.0.1/common/gdm-common.h
===================================================================
--- gdm-45.0.1.orig/common/gdm-common.h
+++ gdm-45.0.1/common/gdm-common.h
@@ -70,6 +70,7 @@ char *gdm_generate_random_bytes
gboolean gdm_get_login_window_session_id (const char *seat_id,
char **session_id);
+char *gdm_gethostname (void);
gboolean gdm_goto_login_session (GCancellable *cancellable,
GError **error);
Index: gdm-45.0.1/daemon/gdm-display-access-file.c
===================================================================
--- gdm-45.0.1.orig/daemon/gdm-display-access-file.c
+++ gdm-45.0.1/daemon/gdm-display-access-file.c
@@ -429,13 +429,10 @@ _get_auth_info_for_display (GdmDisplayAc
*
* https://bugs.freedesktop.org/show_bug.cgi?id=43425
*/
- char localhost[HOST_NAME_MAX + 1] = "";
*family = FamilyLocal;
- if (gethostname (localhost, HOST_NAME_MAX) == 0) {
- *address = g_strdup (localhost);
- } else {
- *address = g_strdup ("localhost");
- }
+ /* using the new function we create in the patch, to detect
+ * changes here, in the original code */
+ *address = gdm_gethostname ();
} else {
*family = FamilyWild;
gdm_display_get_remote_hostname (display, address, NULL);
Index: gdm-45.0.1/daemon/gdm-launch-environment.c
===================================================================
--- gdm-45.0.1.orig/daemon/gdm-launch-environment.c
+++ gdm-45.0.1/daemon/gdm-launch-environment.c
@@ -221,6 +221,11 @@ build_launch_environment (GdmLaunchEnvir
g_hash_table_insert (hash, g_strdup ("GDM_SEAT_ID"), g_strdup (seat_id));
}
+ if (launch_environment->x11_display_is_local) {
+ g_hash_table_remove (hash, "XAUTHLOCALHOSTNAME");
+ g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), gdm_gethostname ());
+ }
+
g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
/* Now populate XDG_DATA_DIRS from env.d if we're running initial setup; this allows
Index: gdm-45.0.1/daemon/gdm-session.c
===================================================================
--- gdm-45.0.1.orig/daemon/gdm-session.c
+++ gdm-45.0.1/daemon/gdm-session.c
@@ -2770,6 +2770,14 @@ set_up_session_environment (GdmSession *
}
}
+ if (self->display_is_local) {
+ char *hostname = gdm_gethostname ();
+ gdm_session_set_environment_variable (self,
+ "XAUTHLOCALHOSTNAME",
+ hostname);
+ g_free (hostname);
+ }
+
if (g_getenv ("WINDOWPATH") != NULL) {
gdm_session_set_environment_variable (self,
"WINDOWPATH",