summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS12
-rw-r--r--sysdeps/unix/sysv/linux/opensock.c9
3 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a4d0605a5..0e37d65cd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/opensock.c (__opensock): Prefer inet
+	sockets on old kernels.
+
 2002-07-22  Philip Blundell  <philb@gnu.org>
 
 	* sysdeps/unix/sysv/linux/arm/errlist.c: Remove extra weak alias
diff --git a/NEWS b/NEWS
index 3a693d0f2b..6676b1e019 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2002-2-26
+GNU C Library NEWS -- history of user-visible changes.  2002-7-24
 Copyright (C) 1992-2000, 2001, 2002 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -31,6 +31,16 @@ Version 2.3
 
 * Bruno Haible upgraded the iconv and locale implementation to support
   Unicode 3.2.
+
+* Content of The LC_* and LANG environments in the CEN style is not recognized
+  anymore.   It never was used.  Change by Ulrich Drepper.
+
+* The runtime (ld.so, libc, libpthread for Linux) now can handle the TLS
+  ABI on some platforms.  Changes by Ulrich Drepper.
+  SH support by Kaz Kojima.
+
+* Bruno Haible contributed iconv converters for ISO-2022-JP-3, SHIFT JIS-X0213,
+  and EUC-JISX0213.
 
 Version 2.2.5
 
diff --git a/sysdeps/unix/sysv/linux/opensock.c b/sysdeps/unix/sysv/linux/opensock.c
index f3d3881b5f..86c4d39630 100644
--- a/sysdeps/unix/sysv/linux/opensock.c
+++ b/sysdeps/unix/sysv/linux/opensock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -36,8 +36,15 @@ __opensock (void)
     const char procname[15];
   } afs[] =
     {
+      /* The 2.2 kernels cannot handle ioctl(SIOCGIFCONF) on AF_UNIX sockets.
+	 Give the kernel a chance to user inet sockets on old kernels.  */
+#if __LINUX_KERNEL_VERSION < 132096
+      { AF_INET, "" },
+      { AF_UNIX, "net/unix" },
+#else
       { AF_UNIX, "net/unix" },
       { AF_INET, "" },
+#endif
       { AF_INET6, "net/if_inet6" },
       { AF_AX25, "net/ax25" },
       { AF_NETROM, "net/nr" },