2 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0702195..2fad440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-16  Ulrich Drepper  <drepper@cygnus.com>
+
+	* nscd/cache.c (prune_cache): Only disable file checking for
+	future if the file does not exist.
+	Update file_mtime if cache was flushed.
+
 1999-04-15  David S. Miller  <davem@redhat.com>
 
 	* sysdeps/sparc/sparc32/strcat.S: Avoid using register g6.
diff --git a/nscd/cache.c b/nscd/cache.c
index 52ef038..e57c868 100644
--- a/nscd/cache.c
+++ b/nscd/cache.c
@@ -142,10 +142,12 @@ prune_cache (struct database *table, time_t now)
       if (stat (table->filename, &st) < 0)
 	{
 	  char buf[128];
-	  /* We cannot stat() the file, disable file checking.  */
+	  /* We cannot stat() the file, disable file checking if the
+             file does not exist.  */
 	  dbg_log (_("cannot stat() file `%s': %s"),
 		   table->filename, strerror_r (errno, buf, sizeof (buf)));
-	  table->check_file = 0;
+	  if (errno == ENOENT)
+	    table->check_file = 0;
 	}
       else
 	{
@@ -153,7 +155,7 @@ prune_cache (struct database *table, time_t now)
 	    {
 	      /* The file changed.  Invalidate all entries.  */
 	      now = LONG_MAX;
-	      st.st_mtime = table->file_mtime;
+	      table->file_mtime = st.st_mtime;
 	    }
 	}
     }