Update.

1999-05-14  Ulrich Drepper  <drepper@cygnus.com>

	* nss/getXXbyYY.c: Add free_mem function which disposes all
	statically allocated memory when debugging.
	* nss/getXXent.c: Likewise.
	* nss/nsswitch.c: Likewise.

5 files changed, 98 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b0c755e..38c2bb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-05-14  Ulrich Drepper  <drepper@cygnus.com>
+
+	* nss/getXXbyYY.c: Add free_mem function which disposes all
+	statically allocated memory when debugging.
+	* nss/getXXent.c: Likewise.
+	* nss/nsswitch.c: Likewise.
+
 1999-05-13  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/gnu/getutmpx.c: New file.
diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c
index 16f01de..15cdcba 100644
--- a/nss/getXXbyYY.c
+++ b/nss/getXXbyYY.c
@@ -72,11 +72,13 @@ extern int INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf,
 /* We need to protect the dynamic buffer handling.  */
 __libc_lock_define_initialized (static, lock);
 
+/* This points to the static buffer used.  */
+static char *buffer;
+
 
 LOOKUP_TYPE *
 FUNCTION_NAME (ADD_PARAMS)
 {
-  static char *buffer;
   static size_t buffer_size;
   static LOOKUP_TYPE resbuf;
   LOOKUP_TYPE *result;
@@ -151,3 +153,14 @@ done:
 
   return result;
 }
+
+
+/* Free all resources if necessary.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  if (buffer != NULL)
+    free (buffer);
+}
+
+text_set_element (__libc_subfreeres, free_mem);
diff --git a/nss/getXXent.c b/nss/getXXent.c
index 491ab4d..e40d41b 100644
--- a/nss/getXXent.c
+++ b/nss/getXXent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999 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
@@ -62,11 +62,13 @@ extern int INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer,
 /* We need to protect the dynamic buffer handling.  */
 __libc_lock_define_initialized (static, lock);
 
+/* This points to the static buffer used.  */
+static char *buffer;
+
 
 LOOKUP_TYPE *
 GETFUNC_NAME (void)
 {
-  static char *buffer;
   static size_t buffer_size;
   static LOOKUP_TYPE resbuf;
   LOOKUP_TYPE *result;
@@ -113,3 +115,14 @@ GETFUNC_NAME (void)
 
   return result;
 }
+
+
+/* Free all resources if necessary.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  if (buffer != NULL)
+    free (buffer);
+}
+
+text_set_element (__libc_subfreeres, free_mem);
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 241fa2c..8874b0c 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -753,3 +753,62 @@ nss_new_service (name_database *database, const char *name)
 
   return *currentp;
 }
+
+
+static void
+nothing (void *ptr __attribute__ ((unused)))
+{
+}
+
+
+/* Free all resources if necessary.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  name_database *top = service_table;
+  name_database_entry *entry;
+  service_library *library;
+
+  if (top == NULL)
+    /* Maybe we have not read the nsswitch.conf file.  */
+    return;
+
+  /* Don't disturb ongoing other threads (if there are any).  */
+  service_table = NULL;
+
+  entry = top->entry;
+  while (entry != NULL)
+    {
+      name_database_entry *olde = entry;
+      service_user *service = entry->service;
+
+      while (service != NULL)
+	{
+	  service_user *olds = service;
+
+	  if (service->known != NULL)
+	    __tdestroy (service->known, nothing);
+
+	  service = service->next;
+	  free (olds);
+	}
+
+      entry = entry->next;
+      free (olde);
+    }
+
+  library = top->library;
+  while (library != NULL)
+    {
+      service_library *oldl = library;
+
+      _dl_close (library->lib_handle);
+
+      library = library->next;
+      free (oldl);
+    }
+
+  free (top);
+}
+
+text_set_element (__libc_subfreeres, free_mem);
diff --git a/sysdeps/gnu/getutmp.c b/sysdeps/gnu/getutmp.c
index ab21863..2fe53bf 100644
--- a/sysdeps/gnu/getutmp.c
+++ b/sysdeps/gnu/getutmp.c
@@ -19,7 +19,10 @@
 #include <assert.h>
 #include <string.h>
 #include <utmp.h>
+/* This is an ugly hack but we must not see the getutmpx declaration.  */
+#define getutmpx XXXgetutmpx
 #include <utmpx.h>
+#undef getutmpx
 
 void
 getutmp (const struct utmpx *utmpx, struct utmp *utmp)