From 6f8e460ea4431e18ed68f79b968bb6d81c8fa4b0b4cd2f49c5403fcfc05edbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojtek=20Dziewi=C4=99cki?= Date: Wed, 2 Oct 2013 14:49:11 +0000 Subject: [PATCH] rm unused patch OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=123 --- bug-786096_cronie-fdleak.diff | 42 ----------------------------------- 1 file changed, 42 deletions(-) delete mode 100644 bug-786096_cronie-fdleak.diff diff --git a/bug-786096_cronie-fdleak.diff b/bug-786096_cronie-fdleak.diff deleted file mode 100644 index ec1f9a9..0000000 --- a/bug-786096_cronie-fdleak.diff +++ /dev/null @@ -1,42 +0,0 @@ - -diff --git a/src/cron.c b/src/cron.c -index 7dc2958..69261c1 100644 ---- a/src/cron.c -+++ b/src/cron.c -@@ -87,22 +87,21 @@ void set_cron_watched(int fd) { - for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) { - int w; - -- if (open(watchpaths[i], O_RDONLY | O_NONBLOCK, 0) != -1) { -- w = inotify_add_watch(fd, watchpaths[i], -- IN_CREATE | IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO | -- IN_MOVED_FROM | IN_MOVE_SELF | IN_DELETE | IN_DELETE_SELF); -- if (w < 0) { -- if (wd[i] != -1) { -- log_it("CRON", pid, "This directory or file can't be watched", -- watchpaths[i], errno); -- log_it("CRON", pid, "INFO", "running without inotify support", 0); -- } -- inotify_enabled = 0; -- set_cron_unwatched(fd); -- return; -+ w = inotify_add_watch(fd, watchpaths[i], -+ IN_CREATE | IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO | -+ IN_MOVED_FROM | IN_MOVE_SELF | IN_DELETE | IN_DELETE_SELF); -+ if (w < 0) { -+ if (wd[i] != -1) { -+ log_it("CRON", pid, "This directory or file can't be watched", -+ watchpaths[i], errno); -+ log_it("CRON", pid, "INFO", "running without inotify support", -+ 0); - } -- wd[i] = w; -+ inotify_enabled = 0; -+ set_cron_unwatched(fd); -+ return; - } -+ wd[i] = w; - } - - if (!inotify_enabled) { -