[BZ #217, BZ #219]

2004-06-14  Jakub Jelinek  <jakub@redhat.com>
	[BZ #219]
	* nss/nsswitch.c (free_mem): Don't try to close a library handle
	if the handle is invalid.  Patch by David Kimdon <kimdon@esrf.fr>.

2004-06-11  Dmitry V. Levin  <ldv@altlinux.org>

	[BZ #217]
	* debug/xtrace.sh: Fix typo in error diagnostics.

3 files changed, 16 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index be5ec8d..175f44b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-14  Jakub Jelinek  <jakub@redhat.com>
+
+	[BZ #219]
+	* nss/nsswitch.c (free_mem): Don't try to close a library handle
+	if the handle is invalid.  Patch by David Kimdon <kimdon@esrf.fr>.
+
+2004-06-11  Dmitry V. Levin  <ldv@altlinux.org>
+
+	[BZ #217]
+	* debug/xtrace.sh: Fix typo in error diagnostics.
+
 2004-06-14  Andreas Schwab  <schwab@suse.de>
 
 	* stdio-common/psignal.c (psignal): Don't use BUF when asprintf
diff --git a/debug/xtrace.sh b/debug/xtrace.sh
index 43a74a0..4ce8888 100755
--- a/debug/xtrace.sh
+++ b/debug/xtrace.sh
@@ -143,7 +143,7 @@ fi
 program=$1
 shift
 if test ! -f "$program"; then
-  printf >2& $"executable \`$program' not found\n"
+  printf >&2 $"executable \`$program' not found\n"
   help_info
 fi
 if test ! -x "$program"; then
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index b983e34..895b178 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1996-1999,2001,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -749,7 +750,8 @@ libc_freeres_fn (free_mem)
     {
       service_library *oldl = library;
 
-      __libc_dlclose (library->lib_handle);
+      if (library->lib_handle && library->lib_handle != (void *) -1l)
+	__libc_dlclose (library->lib_handle);
 
       library = library->next;
       free (oldl);