rpms/gdm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Use gethostname() _properly_ instead of g_get_host_name() when writing

Browse Source 
out xauth files, because the hostname may change out from under us and
    glib caches it.
This commit is contained in:
Ray Strode 2009-03-19 21:20:43 +00:00
parent 8cc3037d7e
commit 8fbee730da
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdm-2.25.2-dont-depend-on-hostname.patch
View File

@ -212,14 +212,18 @@ index 19432dc..a241f73 100644
} }
--- a/daemon/gdm-display-access-file.c (revision 6790) --- a/daemon/gdm-display-access-file.c (revision 6790)
+++ b/daemon/gdm-display-access-file.c (working copy) +++ b/daemon/gdm-display-access-file.c (working copy)
@@ -438,8 +438,9 @@ _get_auth_info_for_display (GdmDisplayAc @@ -438,8 +438,13 @@ _get_auth_info_for_display (GdmDisplayAc
gdm_display_is_local (display, &is_local, NULL); gdm_display_is_local (display, &is_local, NULL);
if (is_local) { if (is_local) {
+ char localhost[HOST_NAME_MAX + 1] = ""; + char localhost[HOST_NAME_MAX + 1] = "";
*family = FamilyLocal; *family = FamilyLocal;
- *address = g_strdup (g_get_host_name ()); - *address = g_strdup (g_get_host_name ());
+ *address = g_strdup (gethostname (localhost, HOST_NAME_MAX)); + if (gethostname (localhost, HOST_NAME_MAX) == 0) {
+ *address = g_strdup (localhost);
+ } else {
+ *address = g_strdup ("localhost");
+ }
} else { } else {
*family = FamilyWild; *family = FamilyWild;
gdm_display_get_remote_hostname (display, address, NULL); gdm_display_get_remote_hostname (display, address, NULL);

7
gdm.spec
View File

@ -15,7 +15,7 @@
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
Name: gdm Name: gdm
Version: 2.26.0 Version: 2.26.0
Release: 4%{?dist} Release: 5%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: User Interface/X Group: User Interface/X
@ -350,6 +350,11 @@ fi
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
%changelog %changelog
* Thu Mar 19 2009 Ray Strode <rstrode@redhat.com> - 1:2.26.0-5
- Use gethostname() _properly_ instead of g_get_host_name() when writing
out xauth files, because the hostname may change out from
under us and glib caches it.
* Thu Mar 19 2009 Ray Strode <rstrode@redhat.com> - 1:2.26.0-4 * Thu Mar 19 2009 Ray Strode <rstrode@redhat.com> - 1:2.26.0-4
- Use gethostname() instead of g_get_host_name() when writing - Use gethostname() instead of g_get_host_name() when writing
out xauth files, because the hostname may change out from out xauth files, because the hostname may change out from