View | Details | Raw Unified | Return to bug 14906 | Differences between
and this patch

Collapse All | Expand All

(-)glibc-2.11.3.orig/nscd/cache.c (-1 lines)
Lines 264-270 prune_cache (struct database_dyn *table, Link Here
264
264
265
  /* If we check for the modification of the underlying file we invalidate
265
  /* If we check for the modification of the underlying file we invalidate
266
     the entries also in this case.  */
266
     the entries also in this case.  */
267
  if (table->inotify_descr < 0 && table->check_file && now != LONG_MAX)
268
    {
267
    {
269
      struct stat64 st;
268
      struct stat64 st;
270
      time_t mtime;
269
      time_t mtime;
(-)glibc-2.11.3.orig/nscd/connections.c (-4 / +7 lines)
Lines 848-858 cannot set socket to close on exec: %s; Link Here
848
	if (dbs[cnt].check_file)
848
	if (dbs[cnt].check_file)
849
	  {
849
	  {
850
#ifdef HAVE_INOTIFY
850
#ifdef HAVE_INOTIFY
851
	    if (inotify_fd < 0
851
	    if (inotify_fd >= 0)
852
		|| (dbs[cnt].inotify_descr
852
	      {
853
		dbs[cnt].inotify_descr
853
		    = inotify_add_watch (inotify_fd, dbs[cnt].filename,
854
		    = inotify_add_watch (inotify_fd, dbs[cnt].filename,
854
					 IN_DELETE_SELF | IN_MODIFY)) < 0)
855
					 IN_DELETE_SELF | IN_MODIFY);
855
	      /* We cannot notice changes in the main thread.  */
856
	      }
857
	      /* Always fall back to checking file modification times.  In its
858
		 current form the inotify check is totally unreliable  */
856
#endif
859
#endif
857
	      {
860
	      {
858
		/* We need the modification date of the file.  */
861
		/* We need the modification date of the file.  */

Return to bug 14906