qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* nscd/hstcache.c (cache_addhst): Remove unnecessary conditional. 

* nscd/servicescache.c (cache_addserv): Likewise.

	* nscd/grpcache.c (cache_addgr): In case a record changed on
	refresh, adjust key_copy.
This commit is contained in:
Ulrich Drepper 2007-02-21 09:11:47 +00:00
parent 61705e06e1
commit c8703f8849
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2007-02-21 Ulrich Drepper <drepper@redhat.com> 2007-02-21 Ulrich Drepper <drepper@redhat.com>
* nscd/hstcache.c (cache_addhst): Remove unnecessary conditional.
* nscd/servicescache.c (cache_addserv): Likewise.
* nscd/grpcache.c (cache_addgr): In case a record changed on
refresh, adjust key_copy.
[BZ #4074] [BZ #4074]
* nscd/pwdcache.c (cache_addpw): In case a record changed on * nscd/pwdcache.c (cache_addpw): In case a record changed on
refresh, adjust key_copy. refresh, adjust key_copy.

1
nscd/grpcache.c
View File

@ -279,6 +279,7 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
/* Adjust pointers into the memory block. */ /* Adjust pointers into the memory block. */
gr_name = (char *) newp + (gr_name - (char *) dataset); gr_name = (char *) newp + (gr_name - (char *) dataset);
cp = (char *) newp + (cp - (char *) dataset); cp = (char *) newp + (cp - (char *) dataset);
key_copy = (char *) newp + (key_copy - (char *) dataset);
dataset = memcpy (newp, dataset, total + n); dataset = memcpy (newp, dataset, total + n);
alloca_used = false; alloca_used = false;

4
nscd/hstcache.c
View File

@ -311,8 +311,8 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
/* Adjust pointers into the memory block. */ /* Adjust pointers into the memory block. */
addresses = (char *) newp + (addresses - (char *) dataset); addresses = (char *) newp + (addresses - (char *) dataset);
aliases = (char *) newp + (aliases - (char *) dataset); aliases = (char *) newp + (aliases - (char *) dataset);
if (key_copy != NULL) assert (key_copy != NULL);
key_copy = (char *) newp + (key_copy - (char *) dataset); key_copy = (char *) newp + (key_copy - (char *) dataset);
dataset = memcpy (newp, dataset, total + req->key_len); dataset = memcpy (newp, dataset, total + req->key_len);
alloca_used = false; alloca_used = false;

4
nscd/servicescache.c
View File

@ -264,8 +264,8 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
{ {
/* Adjust pointers into the memory block. */ /* Adjust pointers into the memory block. */
aliases = (char *) newp + (aliases - (char *) dataset); aliases = (char *) newp + (aliases - (char *) dataset);
if (key_copy != NULL) assert (key_copy != NULL);
key_copy = (char *) newp + (key_copy - (char *) dataset); key_copy = (char *) newp + (key_copy - (char *) dataset);
dataset = memcpy (newp, dataset, total + req->key_len); dataset = memcpy (newp, dataset, total + req->key_len);
alloca_used = false; alloca_used = false;