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)

2 files changed, 43 insertions, 0 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 7cfdbd65f11b..27e6e8de6016 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -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
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