Update.

1999-06-24  Thorsten Kukuk  <kukuk@suse.de>

	* nscd/grpcache.c: Add "notfound" data to cache, not iov pointer.
	* nscd/pwdcache.c: Likewise.
	* nscd/hstcache.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index a4c1f2dddfdb50f82e48c1589af93e6bf6804359..56b0d290b146609353f3adbf5a6cb01e6b451589 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-06-24  Thorsten Kukuk  <kukuk@suse.de>
+
+       * nscd/grpcache.c: Add "notfound" data to cache, not iov pointer.
+       * nscd/pwdcache.c: Likewise.
+       * nscd/hstcache.c: Likewise.
+
 1999-06-23  Ulrich Drepper  <drepper@cygnus.com>
 
        * sysdeps/generic/fpu_control.c: Include math.h for __P definition.

diff --git a/assert/assert.h b/assert/assert.h
index 386e80c3b17000afe5d4d6693c9a1660a04c331f..326183a272a75278979a734be98cc0c27ac692ee 100644 (file)
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -90,7 +90,7 @@ __END_DECLS
    This is broken in G++ before version 2.6.
    C9x has a similar variable called __func__, but prefer the GCC one since
    it demangles C++ function names.  */
-# if __GNUC_PREREQ (2, (defined __cplusplus ? 6 : 4))
+# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
 #   define __ASSERT_FUNCTION   __PRETTY_FUNCTION__
 # else
 #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L

diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 62f4c573a60d63dcd3011b99bfb143769a58bf37..446e78ed28eddb67bcb4cab182448c3866390f67 100644 (file)
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -105,7 +105,7 @@ cache_addgr (struct database *db, int fd, request_header *req, void *key,
       /* Now get the lock to safely insert the records.  */
       pthread_rwlock_rdlock (&db->lock);
 
-      cache_add (req->type, copy, req->key_len, &iov_notfound,
+      cache_add (req->type, copy, req->key_len, &notfound,
                 sizeof (notfound), (void *) -1, 0, t, db, owner);
 
       pthread_rwlock_unlock (&db->lock);

diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 292d9187e4f80c83054bcc9cbf6d702a591af8c2..93b71a65d62720e3b3866d144820f4d311d9e06b 100644 (file)
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -116,7 +116,7 @@ cache_addhst (struct database *db, int fd, request_header *req, void *key,
       /* Now get the lock to safely insert the records.  */
       pthread_rwlock_rdlock (&db->lock);
 
-      cache_add (req->type, copy, req->key_len, &iov_notfound,
+      cache_add (req->type, copy, req->key_len, &notfound,
                 sizeof (notfound), (void *) -1, 0, t, db, owner);
 
       pthread_rwlock_unlock (&db->lock);

diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 2c4e6c722f8d106b35b99092fef9bf79aaf99fd1..95d6ec3a6ac571e245e6fbe873c5b1e4a22994af 100644 (file)
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -112,7 +112,7 @@ cache_addpw (struct database *db, int fd, request_header *req, void *key,
       /* Now get the lock to safely insert the records.  */
       pthread_rwlock_rdlock (&db->lock);
 
-      cache_add (req->type, copy, req->key_len, &iov_notfound,
+      cache_add (req->type, copy, req->key_len, &notfound,
                 sizeof (notfound), (void *) -1, 0, t, db, owner);
 
       pthread_rwlock_unlock (&db->lock);