34. Added a hack to fc-lang and fc-list to prevent installation if defineXPRINT_BASEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW

    InstallFontconfigLibrary NO (Egbert Eich).
33. Updated Xft to 2.1.5 (Egbert Eich).
32. Make ELF loader work on systems with non-exec stack/heaps (bugzilla
    #296, John Dennis, Mike Harris).
31. Fix for xdm to work on a non-IPv6 system when built with IPv6 support
    (bugzilla #287, Peter Breitenlohner) (confirmed by: Alan Coopersmith).
30. Fix Xi XselectExtensionEvent for 64 bit machines (bugzilla #285,
    Andreas Luik) (confirmed by: Paul Anderson, Alan Coopersmith).

2 files changed, 3 insertions, 2 deletions

diff --git a/chooser.c b/chooser.c
index 23a4a07..17f9a3d 100644
--- a/chooser.c
+++ b/chooser.c
@@ -857,6 +857,7 @@ InitXDMCP (char **argv)
     XtAddInput (socketFD, (XtPointer) XtInputReadMask, ReceivePacket,
 		(XtPointer) &socketFD);
 #if defined(IPv6) && defined(AF_INET6)
+    if (socket6FD != -1)
     XtAddInput (socket6FD, (XtPointer) XtInputReadMask, ReceivePacket,
 		(XtPointer) &socket6FD);
 #endif
diff --git a/socket.c b/socket.c
index 6e01cdb..fe204af 100644
--- a/socket.c
+++ b/socket.c
@@ -69,9 +69,9 @@ CreateWellKnownSockets (void)
 
 #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)
     {