From affb42aff901f407502e4d2c0eb65b4f30a1275d Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Fri, 30 Nov 2012 17:56:58 +0000

Subject: access-file: don't use FamilyLocal for auth cookie

FamilyLocal is really fragile to hostname changes, so

avoid using it when creating the initial auth cookie for

establishing access to the X server for the slave.

This commit changes the Xauthority entry to use FamilyWild

which makes the address of the entry unimportant.

https://bugzilla.gnome.org/show_bug.cgi?id=689370

---

diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c

index cff8b70..02bd414 100644

--- a/daemon/gdm-display-access-file.c

+++ b/daemon/gdm-display-access-file.c

@@ -438,13 +438,8 @@ _get_auth_info_for_display (GdmDisplayAccessFile *file,

         gdm_display_is_local (display, &is_local, NULL);

         if (is_local) {

-                char localhost[HOST_NAME_MAX + 1] = "";

-                *family = FamilyLocal;

-                if (gethostname (localhost, HOST_NAME_MAX) == 0) {

-                        *address = g_strdup (localhost);

-                } else {

-                        *address = g_strdup ("localhost");

-                }

+                *family = FamilyWild;

+                *address = g_strdup ("localhost");

         } else {

                 *family = FamilyWild;

                 gdm_display_get_remote_hostname (display, address, NULL);

--

cgit v0.9.0.2