1217. [port] linux: make handling EINVAL from socket() no longer

                        conditional on #ifdef LINUX.

diff --git a/CHANGES b/CHANGES
index d7cde18038ab04976ca2f50fa67814da857a5350..a07a7ba8a8c5452cc719e7286f0aebed6d0e30cd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1217.  [port]          linux: make handling EINVAL from socket() no longer
+                       conditional on #ifdef LINUX.
+
 1216.  [bug]           isc_log_closefilelogs() needed to lock the log
                        context.
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 042688f34a141620e9b8ac9eecc2503dcbef5699..189f9d234973f9a90bd5ad53e00b3b6232184934 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.226 2002/05/27 00:40:22 marka Exp $ */
+/* $Id: socket.c,v 1.227 2002/06/03 06:31:16 marka Exp $ */
 
 #include <config.h>
 
@@ -1338,13 +1338,11 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
                case EPROTONOSUPPORT:
                case EPFNOSUPPORT:
                case EAFNOSUPPORT:
-#ifdef LINUX
                /*
                 * Linux 2.2 (and maybe others) return EINVAL instead of
                 * EAFNOSUPPORT.
                 */
                case EINVAL:
-#endif
                        return (ISC_R_FAMILYNOSUPPORT);
 
                default: