cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an infinite loop that can occur when gnome-session attempts a logout.

Browse Source 
What happens is gdm gets locked in a tight loop forever reading, but
never processing, the EOF from the IPC socket.

PR:		80906 (amongst others)
This commit is contained in:
Joe Marcus Clarke 2005-05-12 13:18:17 +00:00
parent 7d7f2ac01c
commit 01301006aa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=135131
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11/gdm/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= gdm
PORTVERSION= 2.6.0.9
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6

42
x11/gdm/files/patch-daemon_gdm-net.c Normal file
View File

@ -0,0 +1,42 @@
--- daemon/gdm-net.c.orig Thu May 12 01:00:31 2005
+++ daemon/gdm-net.c Thu May 12 01:00:36 2005
@@ -76,14 +76,14 @@ struct _GdmConnection {
};
static gboolean
-close_if_needed (GdmConnection *conn, GIOCondition cond)
+close_if_needed (GdmConnection *conn, GIOCondition cond, gboolean error)
{
/* non-subconnections are never closed */
if (conn->parent == NULL)
return TRUE;
if (cond & G_IO_ERR ||
- cond & G_IO_HUP) {
+ cond & G_IO_HUP || error) {
gdm_debug ("close_if_needed: Got HUP/ERR on %d", conn->fd);
conn->source = 0;
gdm_connection_close (conn);
@@ -103,11 +103,11 @@ gdm_connection_handler (GIOChannel *sour
size_t len;
if ( ! (cond & G_IO_IN))
- return close_if_needed (conn, cond);
+ return close_if_needed (conn, cond, FALSE);
VE_IGNORE_EINTR (len = read (conn->fd, buf, sizeof (buf) -1));
if (len <= 0) {
- return close_if_needed (conn, cond);
+ return close_if_needed (conn, cond, TRUE);
}
buf[len] = '\0';
@@ -141,7 +141,7 @@ gdm_connection_handler (GIOChannel *sour
}
}
- return close_if_needed (conn, cond);
+ return close_if_needed (conn, cond, FALSE);
}
gboolean