Attachment #244153 for bug #420057

View | Details | Raw Unified | Return to bug 420057
Collapse All | Expand All

Lines 410-416 _get_auth_info_for_display (GdmDisplayAc Link Here

(-)gdm-2.23.92-pre/daemon/gdm-display-access-file.c (-1 / +1 lines)
410		410
411	if (is_local) {	411	if (is_local) {
412	*family = FamilyLocal;	412	*family = FamilyLocal;
413	*address = g_strdup (g_get_host_name ());	413	*address = g_strdup ("localhost");
414	} else {	414	} else {
415	*family = FamilyWild;	415	*family = FamilyWild;
416	gdm_display_get_remote_hostname (display, address, NULL);	416	gdm_display_get_remote_hostname (display, address, NULL);

Lines 1985-1990 setup_session_environment (GdmSessionDir Link Here

(-)gdm-2.23.92-pre/daemon/gdm-session-direct.c (+6 lines)
1985	session->priv->user_x11_authority_file);	1985	session->priv->user_x11_authority_file);
1986	}	1986	}
1987		1987
		1988	if (session->priv->display_is_local) {
		1989	gdm_session_direct_set_environment_variable (session,
		1990	"XAUTHLOCALHOSTNAME",
		1991	"localhost");
		1992	}
		1993
1988	/* FIXME: We do this here and in the session worker. We should consolidate	1994	/* FIXME: We do this here and in the session worker. We should consolidate
1989	* somehow.	1995	* somehow.
1990	*/	1996	*/

Lines 220-225 get_script_environment (GdmSlave *slav Link Here

(-)gdm-2.23.92-pre/daemon/gdm-slave.c (+5 lines)
220	g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname));	220	g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname));
221	}	221	}
222		222
		223	if (slave->priv->display_is_local) {
		224	g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost"));
		225	}
		226
223	/* Runs as root */	227	/* Runs as root */
224	g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file));	228	g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file));
225	g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name));	229	g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name));
Lines 372-377 gdm_slave_connect_to_x11_display (GdmSla Link Here
372		376
373	g_setenv ("DISPLAY", slave->priv->display_name, TRUE);	377	g_setenv ("DISPLAY", slave->priv->display_name, TRUE);
374	g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE);	378	g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE);
		379	g_setenv ("XAUTHLOCALHOSTNAME", "localhost", TRUE);
375		380
376	sigemptyset (&mask);	381	sigemptyset (&mask);
377	sigaddset (&mask, SIGCHLD);	382	sigaddset (&mask, SIGCHLD);

Lines 315-320 get_welcome_environment (GdmWelcomeSessi Link Here

(-)gdm-2.23.92-pre/daemon/gdm-welcome-session.c (+4 lines)
315	g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell));	315	g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell));
316	}	316	}
317		317
		318	if (welcome_session->priv->x11_display_is_local) {
		319	g_hash_table_remove (hash, "XAUTHLOCALHOSTNAME");
		320	g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost"));
		321	}
318		322
319	g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));	323	g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
320		324

Return to bug 420057