[xorg-commit-diffs] xc/programs/xdm access.c, 1.1.4.4, 1.1.4.5 chooser.c, 1.1.4.7, 1.1.4.8 socket.c, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/xdm
In directory pdx:/home/eich/tstbuild/xc/programs/xdm

Modified Files:
      Tag: XORG-CURRENT
	access.c chooser.c socket.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: access.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/access.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/access.c	5 Mar 2004 13:41:21 -0000	1.1.4.4
+++ b/access.c	15 Apr 2004 10:17:39 -0000	1.1.4.5
@@ -904,9 +904,9 @@
 	    h = d->hosts;
 	    if (h != NULL) {
 		(*listenfunction) (&h->entry.hostAddress, closure);
-	    }
-	    for (h = h->next; h != NULL; h = h->next) {
-		(*mcastfunction) (&h->entry.hostAddress, closure);
+		for (h = h->next; h != NULL; h = h->next) {
+		    (*mcastfunction) (&h->entry.hostAddress, closure);
+		}
 	    }
 	}
     }

Index: chooser.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/chooser.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/chooser.c	5 Mar 2004 13:41:21 -0000	1.1.4.7
+++ b/chooser.c	15 Apr 2004 10:17:40 -0000	1.1.4.8
@@ -857,6 +857,7 @@
     XtAddInput (socketFD, (XtPointer) XtInputReadMask, ReceivePacket,
 		(XtPointer) &socketFD);
 #if defined(IPv6) && defined(AF_INET6)
+    if (socket6FD != -1)
     XtAddInput (socket6FD, (XtPointer) XtInputReadMask, ReceivePacket,
 		(XtPointer) &socket6FD);
 #endif

Index: socket.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/socket.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/socket.c	5 Mar 2004 13:41:21 -0000	1.1.4.4
+++ b/socket.c	15 Apr 2004 10:17:40 -0000	1.1.4.5
@@ -69,9 +69,9 @@
 
 #if defined(IPv6) && defined(AF_INET6)
     chooserFd = socket (AF_INET6, SOCK_STREAM, 0);
-#else
-    chooserFd = socket (AF_INET, SOCK_STREAM, 0);
+    if (chooserFd == -1)
 #endif
+    chooserFd = socket (AF_INET, SOCK_STREAM, 0);
     Debug ("Created chooser socket %d\n", chooserFd);
     if (chooserFd == -1)
     {