2007-02-21 Ulrich Drepper <drepper@redhat.com>

	* nscd/grpcache.c (cache_addgr): In case a record changed on
	refresh, adjust key_copy.

	[BZ #4074]
	* nscd/pwdcache.c (cache_addpw): In case a record changed on
	refresh, adjust key_copy.

diff --git a/ChangeLog b/ChangeLog
index 7c6c4789089bc028c0471d816ea8277439ad0102..5e01cc1647e3f9b4b56cbf2311509937753dcf50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-21  Ulrich Drepper  <drepper@redhat.com>
+
+       * nscd/grpcache.c (cache_addgr): In case a record changed on
+       refresh, adjust key_copy.
+
+       [BZ #4074]
+       * nscd/pwdcache.c (cache_addpw): In case a record changed on
+       refresh, adjust key_copy.
+
 2007-02-21  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #3458]

diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 5a8fba47593585e512c8bbc981fbe8388cb0a19a..a8bc61c8df8b06b58cdbba8770466108a9fc625f 100644 (file)
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -279,6 +279,7 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
                  /* Adjust pointers into the memory block.  */
                  gr_name = (char *) newp + (gr_name - (char *) dataset);
                  cp = (char *) newp + (cp - (char *) dataset);
+                 key_copy = (char *) newp + (key_copy - (char *) dataset);
 
                  dataset = memcpy (newp, dataset, total + n);
                  alloca_used = false;

diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 01c223add50a60e72640fc316933e69d3ba403d3..cb07422faec5f48fbe3f6f233424b7d19632c076 100644 (file)
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -274,6 +274,7 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
                {
                  /* Adjust pointer into the memory block.  */
                  cp = (char *) newp + (cp - (char *) dataset);
+                 key_copy = (char *) newp + (key_copy - (char *) dataset);
 
                  dataset = memcpy (newp, dataset, total + n);
                  alloca_used = false;