Handle nscd negtimeout==0

diff --git a/ChangeLog b/ChangeLog
index e3a0b709eca215111df48a4e8bb9dcfd773860cd..a4cd52e5d03d86bfc09bbe158551664d3db1d7d3 100644 (file)
--- 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 6c8d83a7add69106b20c588e09d0991be37657f6..b1369214ea9d322242a5d2e6c4bccb754b4c6482 100644 (file)
--- 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 0e7f81f5355773ac87f4a82c3b70df07e9782344..8a2f80ccdbb07f4032836d90c192b19d2bfd2c91 100644 (file)
--- 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 1ab5860f2dc9c49a44fd671a1e27cda52bb0a5d8..1f09c0b97591c5fb75bed7429dc0348d47baac67 100644 (file)
--- 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 8cb6cf197a198d1afe55e8051aea6d34ba60587f..7fd564d0bc97f326a94dc0fa9dc34292111206ce 100644 (file)
--- 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 47b80520f97f49cc50b057fdb7c2487b0c1e5cb0..94e1c52793370c6e246bda7c32b91d7ea4c83e52 100644 (file)
--- 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;