Bug 22516 - Ensure inotify fd is set close on exec

This prevents it leaking into spawned child processes.

Signed-off-by: Colin Walters <walters@verbum.org>
(cherry picked from commit f4e15893e5be6da6c7642bb7ef9b14d5531afe41)

diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
index 3d8a6663ac83ec6a36220b104b203a23a76721ce..f03e1bd72186bd9ca4f6a1fe492794472fc315a1 100644 (file)
--- a/bus/dir-watch-inotify.c
+++ b/bus/dir-watch-inotify.c
@@ -98,7 +98,11 @@ bus_watch_directory (const char *dir, BusContext *context)
   _dbus_assert (dir != NULL);
 
   if (inotify_fd == -1) {
+#ifdef HAVE_INOTIFY_INIT1
+     inotify_fd = inotify_init1 (IN_CLOEXEC);
+#else
      inotify_fd = inotify_init ();
+#endif
      if (inotify_fd <= 0) {
       _dbus_warn ("Cannot initialize inotify\n");
       goto out;

diff --git a/configure.in b/configure.in
index c4d0ccc3987a2d298a8dbc1a3027a26f8cf6db30..bba68d14a8775e3aaea44e0d0a58fb362a62a981 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -754,7 +754,7 @@ fi
 dnl check if inotify backend is enabled
 if test x$have_inotify = xyes; then
    AC_DEFINE(DBUS_BUS_ENABLE_INOTIFY,1,[Use inotify])
-
+   AC_CHECK_FUNCS(inotify_init1)
 fi
 
 AM_CONDITIONAL(DBUS_BUS_ENABLE_INOTIFY, test x$have_inotify = xyes)