1 diff --git a/src/cron.c b/src/cron.c
2 index 7dc2958..7917589 100644
5 @@ -64,11 +64,19 @@ static int DisableInotify;
7 const char *watchpaths[NUM_WATCHES] = {SPOOL_DIR, SYS_CROND_DIR, SYSCRONTAB};
9 +static void reset_watches(void) {
12 + for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) {
17 void set_cron_unwatched(int fd) {
20 for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) {
23 inotify_rm_watch(fd, wd[i]);
26 @@ -87,22 +95,21 @@ void set_cron_watched(int fd) {
27 for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) {
30 - if (open(watchpaths[i], O_RDONLY | O_NONBLOCK, 0) != -1) {
31 - w = inotify_add_watch(fd, watchpaths[i],
32 - IN_CREATE | IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO |
33 - IN_MOVED_FROM | IN_MOVE_SELF | IN_DELETE | IN_DELETE_SELF);
36 - log_it("CRON", pid, "This directory or file can't be watched",
37 - watchpaths[i], errno);
38 - log_it("CRON", pid, "INFO", "running without inotify support", 0);
40 - inotify_enabled = 0;
41 - set_cron_unwatched(fd);
43 + w = inotify_add_watch(fd, watchpaths[i],
44 + IN_CREATE | IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO |
45 + IN_MOVED_FROM | IN_MOVE_SELF | IN_DELETE | IN_DELETE_SELF);
46 + if (w < 0 && errno != ENOENT) {
48 + log_it("CRON", pid, "This directory or file can't be watched",
49 + watchpaths[i], errno);
50 + log_it("CRON", pid, "INFO", "running without inotify support",
54 + inotify_enabled = 0;
55 + set_cron_unwatched(fd);
61 if (!inotify_enabled) {
62 @@ -120,6 +127,7 @@ static void handle_signals(cron_db * database) {
63 /* watches must be reinstated on reload */
64 if (inotify_enabled && (EnableClustering != 1)) {
65 set_cron_unwatched(database->ifd);
70 @@ -158,9 +166,6 @@ int main(int argc, char *argv[]) {
74 -#if defined WITH_INOTIFY
78 ProgramName = argv[0];
80 @@ -261,13 +266,7 @@ int main(int argc, char *argv[]) {
84 - for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) {
85 - /* initialize to negative number other than -1
86 - * so an eventual error is reported for the first time
92 database.ifd = fd = inotify_init();
93 fcntl(fd, F_SETFD, FD_CLOEXEC);