aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--nscd/hstcache.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a8387f837e..a83f18a14e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-01-24 Ulrich Drepper <drepper@cygnus.com>
+ * nscd/hstcache.c: Don't count in mapped IPv6 addresses in total
+ size anymore.
+
* locale/programs/ld-collate.c (collate_output): Also handle
IGNOREd characters in the simple way when generating the multibyte
table.
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index a2f8115aa2..5ac0cee816 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -157,9 +157,7 @@ cache_addhst (struct database *db, int fd, request_header *req, void *key,
total += (sizeof (struct hostdata)
+ h_name_len
+ h_aliases_cnt * sizeof (size_t)
- + h_addr_list_cnt * (hst->h_length
- + (hst->h_length == NS_INADDRSZ
- ? NS_IN6ADDRSZ : 0)));
+ + h_addr_list_cnt * hst->h_length);
data = (struct hostdata *) malloc (total + req->key_len);
if (data == NULL)