about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThorsten Kukuk <kukuk@suse.de>2011-07-01 22:53:01 -0400
committerUlrich Drepper <drepper@gmail.com>2011-07-01 22:53:01 -0400
commit445b4a53ea9d6c457c5f4ac1538102d8be0a5d89 (patch)
tree3058c0d00c391e0a093eca4825128db7251a8859
parent6d4d8e8eef734412bedfd3a0bcece15109155913 (diff)
downloadglibc-445b4a53ea9d6c457c5f4ac1538102d8be0a5d89.tar.gz
glibc-445b4a53ea9d6c457c5f4ac1538102d8be0a5d89.tar.xz
glibc-445b4a53ea9d6c457c5f4ac1538102d8be0a5d89.zip
Handle nscd negtimeout==0
-rw-r--r--ChangeLog8
-rw-r--r--nscd/aicache.c10
-rw-r--r--nscd/grpcache.c10
-rw-r--r--nscd/hstcache.c10
-rw-r--r--nscd/initgrcache.c10
-rw-r--r--nscd/pwdcache.c10
6 files changed, 44 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index e3a0b709ec..a4cd52e5d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-01  Thorsten Kukuk  <kukuk@suse.de>
+
+	* nscd/pwdcache.c (cache_addpw): Handle zero negtimeout.
+	* nscd/initgrcache.c (addinitgroupsX): Likewise.
+	* nscd/hstcache.c (cache_addhst): Likewise.
+	* nscd/grpcache.c (cache_addgr): Likewise.
+	* nscd/aicache.c (addhstaiX): Likewise
+
 2011-07-01  Andreas Schwab  <schwab@redhat.com>
 
 	* nis/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Query NIS
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 6c8d83a7ad..b1369214ea 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -511,9 +511,15 @@ next_nip:
       if (fd != -1)
 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
 
-      dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1);
       /* If we cannot permanently store the result, so be it.  */
-      if (dataset != NULL)
+      if (db->negtimeout == 0)
+	{
+	  /* Mark the old entry as obsolete.  */
+	  if (dh != NULL)
+	    dh->usable = false;
+	  dataset = NULL;
+	}
+      else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
 	{
 	  dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
 	  dataset->head.recsize = total;
diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 0e7f81f535..8a2f80ccdb 100644
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -118,10 +118,14 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
 						MSG_NOSIGNAL));
 
-	  dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len,
-				   1);
 	  /* If we cannot permanently store the result, so be it.  */
-	  if (dataset != NULL)
+	  if (db->negtimeout == 0)
+	    {
+	      /* Mark the old entry as obsolete.  */
+	      if (dh != NULL)
+		dh->usable = false;
+	    }
+	  else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
 	    {
 	      dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
 	      dataset->head.recsize = total;
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 1ab5860f2d..1f09c0b975 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -141,10 +141,14 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
 					MSG_NOSIGNAL)) != total)
 	    all_written = false;
 
-	  dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len,
-				   1);
 	  /* If we cannot permanently store the result, so be it.  */
-	  if (dataset != NULL)
+	  if (db->negtimeout == 0)
+	    {
+	      /* Mark the old entry as obsolete.  */
+	      if (dh != NULL)
+		dh->usable = false;
+	    }
+	  else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
 	    {
 	      dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
 	      dataset->head.recsize = total;
diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index 8cb6cf197a..7fd564d0bc 100644
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -202,10 +202,14 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
 						MSG_NOSIGNAL));
 
-	  dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len,
-				   1);
 	  /* If we cannot permanently store the result, so be it.  */
-	  if (dataset != NULL)
+	  if (db->negtimeout == 0)
+	    {
+	      /* Mark the old entry as obsolete.  */
+	      if (dh != NULL)
+		dh->usable = false;
+	    }
+	  else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
 	    {
 	      dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
 	      dataset->head.recsize = total;
diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 47b80520f9..94e1c52793 100644
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -124,10 +124,14 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
 						MSG_NOSIGNAL));
 
-	  dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len,
-				   1);
 	  /* If we cannot permanently store the result, so be it.  */
-	  if (dataset != NULL)
+	  if (db->negtimeout == 0)
+	    {
+	      /* Mark the old entry as obsolete.  */
+	      if (dh != NULL)
+		dh->usable = false;
+	    }
+	  else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
 	    {
 	      dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
 	      dataset->head.recsize = total;