From 01301006aa81005396bc69eb57566d0cedadda05 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Thu, 12 May 2005 13:18:17 +0000 Subject: Fix an infinite loop that can occur when gnome-session attempts a logout. 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) --- x11/gdm/files/patch-daemon_gdm-net.c | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 x11/gdm/files/patch-daemon_gdm-net.c (limited to 'x11/gdm/files/patch-daemon_gdm-net.c') diff --git a/x11/gdm/files/patch-daemon_gdm-net.c b/x11/gdm/files/patch-daemon_gdm-net.c new file mode 100644 index 000000000000..caf221d7c950 --- /dev/null +++ b/x11/gdm/files/patch-daemon_gdm-net.c @@ -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 -- cgit v1.2.3