From f4e15893e5be6da6c7642bb7ef9b14d5531afe41 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 10 Jul 2009 20:10:12 -0400 Subject: Bug 22516 - Ensure inotify fd is set close on exec This prevents it leaking into spawned child processes. Signed-off-by: Colin Walters --- bus/dir-watch-inotify.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bus') diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c index 3d8a6663..f03e1bd7 100644 --- 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; -- cgit