[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2004-11-26 23:03:24
Message-ID: 20041126230324.7932518CCB () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

make failure to create ipv6 socket non-fatal


  M +4 -6      choose.c   1.38


--- kdebase/kdm/backend/choose.c  #1.37:1.38
@@ -889,8 +889,5 @@ initXDMCP()
         return 0;
 #if defined(IPv6) && defined(AF_INET6)
-    if ((socket6FD = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-        close(socketFD);
-        return 0;
-    }
+    socket6FD = socket(AF_INET6, SOCK_DGRAM, 0);
 #endif
 # ifdef SO_BROADCAST
@@ -1058,4 +1055,5 @@ DoChoose ()
         FD_SET (socketFD, &rfds);
 #if defined(IPv6) && defined(AF_INET6)
+        if (socket6FD >= 0)
         FD_SET (socket6FD, &rfds);
 #endif
@@ -1100,5 +1098,5 @@ DoChoose ()
                 receivePacket (socketFD);
 #if defined(IPv6) && defined(AF_INET6)
-            if (FD_ISSET (socket6FD, &rfds))
+            if (socket6FD >= 0 && FD_ISSET (socket6FD, &rfds))
                 receivePacket (socket6FD);
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]