Update.

2004-06-18  Ulrich Drepper  <drepper@redhat.com>

	* inet/bug-if1.c: New file.
	* inet/Makefile (tests): Add bug-if1.

3 files changed, 80 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 06d79e1c56..a601f02e96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-18  Ulrich Drepper  <drepper@redhat.com>
+
+	* inet/bug-if1.c: New file.
+	* inet/Makefile (tests): Add bug-if1.
+
 2004-06-18  Roland McGrath  <roland@frob.com>
 
 	* NEWS: Fix a typo.  Update bug-reporting instructions.
diff --git a/inet/Makefile b/inet/Makefile
index 7b7e9b1b77..7367d9cf01 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002, 2003, 2004 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
@@ -50,7 +50,7 @@ routines := htonl htons		\
 aux := check_pf ifreq
 
 tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
-	 tst-gethnm test-ifaddrs
+	 tst-gethnm test-ifaddrs bug-if1
 
 include ../Rules
 
diff --git a/inet/bug-if1.c b/inet/bug-if1.c
new file mode 100644
index 0000000000..ddf49aff5b
--- /dev/null
+++ b/inet/bug-if1.c
@@ -0,0 +1,73 @@
+/* Copyright (C) 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <net/if.h>
+
+
+static int
+do_test (void)
+{
+  /* Get list of all interfaces.  */
+  struct if_nameindex *il = if_nameindex ();
+  if (il == NULL)
+    {
+      puts ("cannot get interface list, maybe the system does not support networking; bailing out");
+      return 0;
+    }
+
+  /* Determine the highest interface number.  */
+  unsigned int max = 0;
+  for (int cnt = 0; il[cnt].if_name != NULL; ++cnt)
+    if (il[cnt].if_index > max)
+      max = il[cnt].if_index;
+
+  /* Use the next higher value (if possible).  */
+  if (max == UINT_MAX)
+    {
+      puts ("highest index too high; need more clever way to determine test index");
+      return 0;
+    }
+
+  char buf[IF_NAMESIZE];
+  char *cp = if_indextoname (max + 1, buf);
+  if (cp != NULL)
+    {
+      printf ("invalid index returned result \"%s\"\n", cp);
+      return 1;
+    }
+  else if (errno != ENXIO)
+    {
+      int err = errno;
+      char errbuf1[256];
+      char errbuf2[256];
+
+      printf ("errno = %d (%s), expected %d (%s)\n",
+	      err, strerror_r (err, errbuf1, sizeof (errbuf1)),
+	      ENXIO, strerror_r (ENXIO, errbuf2, sizeof (errbuf2)));
+      return 1;
+    }
+
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"