summary refs log tree commit diff
path: root/nscd/cache.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-02-07 00:06:12 +0000
committerUlrich Drepper <drepper@redhat.com>1999-02-07 00:06:12 +0000
commit8d8c6efa78d0eb67138bddf96415c2b80a4c820c (patch)
tree9ffb99e37931add0899606dc03b233a2e1e3f933 /nscd/cache.c
parentb8f558b7ace3a2e5e3234ac24a600cbe230da8d1 (diff)
downloadglibc-8d8c6efa78d0eb67138bddf96415c2b80a4c820c.tar.gz
glibc-8d8c6efa78d0eb67138bddf96415c2b80a4c820c.tar.xz
glibc-8d8c6efa78d0eb67138bddf96415c2b80a4c820c.zip
Update.
1999-02-06  Ulrich Drepper  <drepper@cygnus.com>

	* Versions.def: Add versions for ld.so.
	* csu/Versions: Remove __libc_stack_end here.
	* elf/Versions: Split libc definitions in libc and ld.so definitions.
	* elf/Makefile (ld-map): Change to ld.so.map.
	* scripts/versions.awk: Recognize dot in library names.

	* ctype/ctype.h: Remove definitions of __tolower and __toupper.
	Don't use __tolower and __toupper in inline functions.
	Add optimizing macros for tolower and toupper.
	* ctype/ctype-extn.c (_tolower): Don't use __tolower.
	(_toupper): Don't use __toupper.
	* ctype/ctype.c (tolower): Don't use __tolower.
	(toupper): Don't use toupper.

	* nscd/cache.c (prune_cache): Correct printing of debugging messages.

	* resolv/Versions (libresolv): Export __ns_name_unpack and
	__ns_name_ntop.
	* resolv/res_comp.c: Rename ns_name_unpack to __ns_name_unpack and
	make it global.  Change all users.  Similar for ns_name_ntop.
	* resolv/nss_dns/dns-host.c: Don't use dn_expand when extracting in
	user-provided buffer.  Use __ns_name_unpack and __ns_name_ntop
	directly to detect too small buffer.
	* stdio-common/Makefile (tests): Add scanf12.
	* stdio-common/scanf12.c: New file.
	* stdio-common/scanf12.input: New file.
	* stdio-common/vfscanf.c (__vfscanf): Handle +/- at beginning of
	floating-point correctly if the number is invalid.
	* stdio-common/vfscanf.c: Don't use non-reentrant multibyte conversion
	* stdio-common/printf_fphex.c: Likewise.
	* stdio-common/vfprintf.c: Likewise.
See ChangeLog.9 for earlier changes.
Diffstat (limited to 'nscd/cache.c')
-rw-r--r--nscd/cache.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/nscd/cache.c b/nscd/cache.c
index 4ab83db6e2..dbc89fb8ec 100644
--- a/nscd/cache.c
+++ b/nscd/cache.c
@@ -225,10 +225,23 @@ prune_cache (struct database *table, time_t now)
 	  struct hashentry *old = head;
 
 	  if (debug_level > 0)
-	    dbg_log ("remove %s entry \"%s\"",
-		     serv2str[old->type],
-		     old->last
-		     ? old->key : old->data == (void *) -1 ? old->key : "???");
+	    {
+	      char buf[INET6_ADDRSTRLEN];
+	      const char *str;
+
+	      if ((old->type == GETHOSTBYADDR || old->type == GETHOSTBYADDRv6)
+		  && (old->last || old->data == (void *) -1))
+		{
+		  inet_ntop (old->type == GETHOSTBYADDR ? AF_INET : AF_INET6,
+			     old->key, buf, sizeof (buf));
+		  str = buf;
+		}
+	      else
+		str = old->last ? old->key : (old->data == (void *) -1
+					      ? old->key : "???");
+
+	      dbg_log ("remove %s entry \"%s\"", serv2str[old->type], str);
+	    }
 
 	  /* Free the data structures.  */
 	  if (old->data == (void *) -1)