Allow cron(8) to read files from /etc/cron.d and /usr/local/etc/cron.d

[bapt]

Summary

For automation tools it is way easier to maintain files in directories rather
than modifying /etc/crontab.

The files in those directories are in the same format as /etc/crontab

[adrian]

yessss!

[jilles]

head/usr.sbin/cron/cron/cron.8

20

typo

head/usr.sbin/cron/cron/database.c

80

This means that modifying an existing file in /etc/cron.d is not detected. That is an uncommon thing to do.

127

We have filesystems that return DT_UNKNOWN (such as NFS with default options), in which case an fstatat is required.

This check also prevents following symlinks in /etc/cron.d which Debian's cron allows.

[bapt]

head/usr.sbin/cron/cron/database.c

80

That is the same behaviour as how users crontabs are detected to have been modified. I find it pretty convenient :) might be inefficient if lots of cron files have been added any better idea?

127

Fixed thanks

[knu]

This is a long-awaited feature that we have been missing, and it's great we finally have it implemented.

As much as I welcome this, I found a couple of differences in features this implementation has from Debian's, so let me point them out in inline comments.

head/usr.sbin/cron/cron/database.c

80

The cron(8) man page reads: "Note that the crontab(1) command updates the modification time of the spool directory whenever it changes a crontab." So for user crontabs it is transparent to users because they always edit their crontab via crontab(1). On the other hand there's no tool support for /etc/cron.d/*, so you have to manually edit a file in it just to find out crond will not reload it unless you touch /etc/cron.d by hand.

I think we should follow Debian's cron which properly checks modification times of individual files in cron.d: https://anonscm.debian.org/cgit/pkg-cron/pkg-cron.git/tree/database.c?id=1215fdaddba158f32b10f0cc041e634505d50cb8#n118

131

Loading all crontabs into a single namespace that is the same as /etc/crontab ("root") means environment variable settings defined in a file will be overwritten by those in another. So, one crontab file installed by a package may affect system jobs, which does not seem great to me.

Debian seems to allocate separate namespaces for each cron.d file by using the filenames: https://anonscm.debian.org/cgit/pkg-cron/pkg-cron.git/tree/database.c?id=1215fdaddba158f32b10f0cc041e634505d50cb8#n247

[bapt]

In D8400#189384, @knu wrote:

This is a long-awaited feature that we have been missing, and it's great we finally have it implemented.

As much as I welcome this, I found a couple of differences in features this implementation has from Debian's, so let me point them out in inline comments.

I agree with both comments, I do not have much time right now to work on this, right now, do not hesitate to propose a patch if you have time otherwise I will do it as soon as I can find free time

head/etc/mtree/BSD.root.dist

 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 
 #ifdef HAVE_DIALOG
 #include <dialog.h>
 #endif
 
-#define _PATH_ZONETAB           "/usr/share/zoneinfo/zone.tab"
+#define _PATH_ZONETAB           "/usr/share/zoneinfo/zone1970.tab"
 #define _PATH_ISO3166           "/usr/share/misc/iso3166"
 #define _PATH_ZONEINFO          "/usr/share/zoneinfo"
 #define _PATH_LOCALTIME         "/etc/localtime"
 #define _PATH_DB                "/var/db/zoneinfo"
 #define _PATH_WALL_CMOS_CLOCK   "/etc/wall_cmos_clock"
 
 #ifdef PATH_MAX
 #define SILLY_BUFFER_SIZE       2*PATH_MAX

 static int        set_zone_menu(dialogMenuItem *);
 static int      set_zone_utc(void);
 
 struct continent {
         dialogMenuItem *menu;
         int             nitems;
 };
 
-static struct continent        africa, america, antarctica, arctic, asia, atlantic;
+static struct continent        africa, america, antarctica, asia, atlantic;
 static struct continent        australia, europe, indian, pacific, utc;
 
 static struct continent_names {
         const char      *name;
         struct continent *continent;
 } continent_names[] = {
         { "Africa",        &africa },
         { "America",        &america },
         { "Antarctica",        &antarctica },
-        { "Arctic",        &arctic },
         { "Asia",        &asia },
         { "Atlantic",        &atlantic },
         { "Australia",        &australia },
         { "Europe",        &europe },
         { "Indian",        &indian },
         { "Pacific",        &pacific },
         { "UTC",        &utc }
 };
 
 static struct continent_items {
         char            prompt[2];
         char            title[30];
 } continent_items[] = {
         { "1",        "Africa" },
         { "2",        "America -- North and South" },
         { "3",        "Antarctica" },
-        { "4",        "Arctic Ocean" },
-        { "5",        "Asia" },
-        { "6",        "Atlantic Ocean" },
-        { "7",        "Australia" },
-        { "8",        "Europe" },
-        { "9",        "Indian Ocean" },
-        { "0",        "Pacific Ocean" },
-        { "a",        "UTC" }
+        { "4",        "Asia" },
+        { "5",        "Atlantic Ocean" },
+        { "6",        "Australia" },
+        { "7",        "Europe" },
+        { "8",        "Indian Ocean" },
+        { "9",        "Pacific Ocean" },
+        { "0",        "UTC" }
 };
 
 #define NCONTINENTS     \
     (int)((sizeof(continent_items)) / (sizeof(continent_items[0])))
 static dialogMenuItem continents[NCONTINENTS];
 
-#define OCEANP(x)       ((x) == 3 || (x) == 5 || (x) == 8 || (x) == 9)
+#define OCEANP(x)       ((x) == 4 || (x) == 7 || (x) == 8)
 
 static int
 continent_country_menu(dialogMenuItem *continent)
 {
         char                title[64], prompt[64];
         struct continent *contp = continent->data;
         int                isocean = OCEANP(continent - continents);
         int             menulen;

 
 static void
 read_zones(void)
 {
         char            contbuf[16];
         FILE            *fp;
         struct continent *cont;
         size_t          len, contlen;
-        char                *line, *tlc, *file, *descr, *p;
+        char                *line, *country_list, *tlc, *file, *descr, *p;
         int             lineno;
 
         fp = fopen(path_zonetab, "r");
         if (!fp)
                 err(1, "%s", path_zonetab);
         lineno = 0;
 
         while ((line = fgetln(fp, &len)) != NULL) {
                 lineno++;
                 if (line[len - 1] != '\n')
                         errx(1, "%s:%d: invalid format", path_zonetab, lineno);
                 line[len - 1] = '\0';
                 if (line[0] == '#')
                         continue;
 
-                tlc = strsep(&line, "\t");
-                if (strlen(tlc) != 2)
-                        errx(1, "%s:%d: invalid country code `%s'",
-                            path_zonetab, lineno, tlc);
+                country_list = strsep(&line, "\t");
                 /* coord = */ strsep(&line, "\t");         /* Unused */
                 file = strsep(&line, "\t");
                 /* get continent portion from continent/country */
                 p = strchr(file, '/');
                 if (p == NULL)
                         errx(1, "%s:%d: invalid zone name `%s'", path_zonetab,
                             lineno, file);
                 contlen = p - file + 1;                /* trailing nul */
                 if (contlen > sizeof(contbuf))
                         errx(1, "%s:%d: continent name in zone name `%s' too long",
                             path_zonetab, lineno, file);
                 strlcpy(contbuf, file, contlen);
                 cont = find_continent(contbuf);
                 if (!cont)
                         errx(1, "%s:%d: invalid region `%s'", path_zonetab,
                             lineno, contbuf);
 
                 descr = (line != NULL && *line != '\0') ? line : NULL;
 
+                while (country_list != NULL) {
+                        tlc = strsep(&country_list, ",");
+                        if (strlen(tlc) != 2)
+                                errx(1, "%s:%d: invalid country code `%s'",
+                                    path_zonetab, lineno, tlc);
                         add_zone_to_country(lineno, tlc, descr, file, cont);
+                }
         }
         fclose(fp);
 }
 
 static void
 make_menus(void)
 {
         struct country  *cp;

head/usr.sbin/cron/cron/cron.h

 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 
 #ifdef HAVE_DIALOG
 #include <dialog.h>
 #endif
 
-#define _PATH_ZONETAB           "/usr/share/zoneinfo/zone.tab"
+#define _PATH_ZONETAB           "/usr/share/zoneinfo/zone1970.tab"
 #define _PATH_ISO3166           "/usr/share/misc/iso3166"
 #define _PATH_ZONEINFO          "/usr/share/zoneinfo"
 #define _PATH_LOCALTIME         "/etc/localtime"
 #define _PATH_DB                "/var/db/zoneinfo"
 #define _PATH_WALL_CMOS_CLOCK   "/etc/wall_cmos_clock"
 
 #ifdef PATH_MAX
 #define SILLY_BUFFER_SIZE       2*PATH_MAX

 static int        set_zone_menu(dialogMenuItem *);
 static int      set_zone_utc(void);
 
 struct continent {
         dialogMenuItem *menu;
         int             nitems;
 };
 
-static struct continent        africa, america, antarctica, arctic, asia, atlantic;
+static struct continent        africa, america, antarctica, asia, atlantic;
 static struct continent        australia, europe, indian, pacific, utc;
 
 static struct continent_names {
         const char      *name;
         struct continent *continent;
 } continent_names[] = {
         { "Africa",        &africa },
         { "America",        &america },
         { "Antarctica",        &antarctica },
-        { "Arctic",        &arctic },
         { "Asia",        &asia },
         { "Atlantic",        &atlantic },
         { "Australia",        &australia },
         { "Europe",        &europe },
         { "Indian",        &indian },
         { "Pacific",        &pacific },
         { "UTC",        &utc }
 };
 
 static struct continent_items {
         char            prompt[2];
         char            title[30];
 } continent_items[] = {
         { "1",        "Africa" },
         { "2",        "America -- North and South" },
         { "3",        "Antarctica" },
-        { "4",        "Arctic Ocean" },
-        { "5",        "Asia" },
-        { "6",        "Atlantic Ocean" },
-        { "7",        "Australia" },
-        { "8",        "Europe" },
-        { "9",        "Indian Ocean" },
-        { "0",        "Pacific Ocean" },
-        { "a",        "UTC" }
+        { "4",        "Asia" },
+        { "5",        "Atlantic Ocean" },
+        { "6",        "Australia" },
+        { "7",        "Europe" },
+        { "8",        "Indian Ocean" },
+        { "9",        "Pacific Ocean" },
+        { "0",        "UTC" }
 };
 
 #define NCONTINENTS     \
     (int)((sizeof(continent_items)) / (sizeof(continent_items[0])))
 static dialogMenuItem continents[NCONTINENTS];
 
-#define OCEANP(x)       ((x) == 3 || (x) == 5 || (x) == 8 || (x) == 9)
+#define OCEANP(x)       ((x) == 4 || (x) == 7 || (x) == 8)
 
 static int
 continent_country_menu(dialogMenuItem *continent)
 {
         char                title[64], prompt[64];
         struct continent *contp = continent->data;
         int                isocean = OCEANP(continent - continents);
         int             menulen;

 
 static void
 read_zones(void)
 {
         char            contbuf[16];
         FILE            *fp;
         struct continent *cont;
         size_t          len, contlen;
-        char                *line, *tlc, *file, *descr, *p;
+        char                *line, *country_list, *tlc, *file, *descr, *p;
         int             lineno;
 
         fp = fopen(path_zonetab, "r");
         if (!fp)
                 err(1, "%s", path_zonetab);
         lineno = 0;
 
         while ((line = fgetln(fp, &len)) != NULL) {
                 lineno++;
                 if (line[len - 1] != '\n')
                         errx(1, "%s:%d: invalid format", path_zonetab, lineno);
                 line[len - 1] = '\0';
                 if (line[0] == '#')
                         continue;
 
-                tlc = strsep(&line, "\t");
-                if (strlen(tlc) != 2)
-                        errx(1, "%s:%d: invalid country code `%s'",
-                            path_zonetab, lineno, tlc);
+                country_list = strsep(&line, "\t");
                 /* coord = */ strsep(&line, "\t");         /* Unused */
                 file = strsep(&line, "\t");
                 /* get continent portion from continent/country */
                 p = strchr(file, '/');
                 if (p == NULL)
                         errx(1, "%s:%d: invalid zone name `%s'", path_zonetab,
                             lineno, file);
                 contlen = p - file + 1;                /* trailing nul */
                 if (contlen > sizeof(contbuf))
                         errx(1, "%s:%d: continent name in zone name `%s' too long",
                             path_zonetab, lineno, file);
                 strlcpy(contbuf, file, contlen);
                 cont = find_continent(contbuf);
                 if (!cont)
                         errx(1, "%s:%d: invalid region `%s'", path_zonetab,
                             lineno, contbuf);
 
                 descr = (line != NULL && *line != '\0') ? line : NULL;
 
+                while (country_list != NULL) {
+                        tlc = strsep(&country_list, ",");
+                        if (strlen(tlc) != 2)
+                                errx(1, "%s:%d: invalid country code `%s'",
+                                    path_zonetab, lineno, tlc);
                         add_zone_to_country(lineno, tlc, descr, file, cont);
+                }
         }
         fclose(fp);
 }
 
 static void
 make_menus(void)
 {
         struct country  *cp;

head/usr.sbin/cron/cron/cron.8

 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 
 #ifdef HAVE_DIALOG
 #include <dialog.h>
 #endif
 
-#define _PATH_ZONETAB           "/usr/share/zoneinfo/zone.tab"
+#define _PATH_ZONETAB           "/usr/share/zoneinfo/zone1970.tab"
 #define _PATH_ISO3166           "/usr/share/misc/iso3166"
 #define _PATH_ZONEINFO          "/usr/share/zoneinfo"
 #define _PATH_LOCALTIME         "/etc/localtime"
 #define _PATH_DB                "/var/db/zoneinfo"
 #define _PATH_WALL_CMOS_CLOCK   "/etc/wall_cmos_clock"
 
 #ifdef PATH_MAX
 #define SILLY_BUFFER_SIZE       2*PATH_MAX

 static int        set_zone_menu(dialogMenuItem *);
 static int      set_zone_utc(void);
 
 struct continent {
         dialogMenuItem *menu;
         int             nitems;
 };
 
-static struct continent        africa, america, antarctica, arctic, asia, atlantic;
+static struct continent        africa, america, antarctica, asia, atlantic;
 static struct continent        australia, europe, indian, pacific, utc;
 
 static struct continent_names {
         const char      *name;
         struct continent *continent;
 } continent_names[] = {
         { "Africa",        &africa },
         { "America",        &america },
         { "Antarctica",        &antarctica },
-        { "Arctic",        &arctic },
         { "Asia",        &asia },
         { "Atlantic",        &atlantic },
         { "Australia",        &australia },
         { "Europe",        &europe },
         { "Indian",        &indian },
         { "Pacific",        &pacific },
         { "UTC",        &utc }
 };
 
 static struct continent_items {
         char            prompt[2];
         char            title[30];
 } continent_items[] = {
         { "1",        "Africa" },
         { "2",        "America -- North and South" },
         { "3",        "Antarctica" },
-        { "4",        "Arctic Ocean" },
-        { "5",        "Asia" },
-        { "6",        "Atlantic Ocean" },
-        { "7",        "Australia" },
-        { "8",        "Europe" },
-        { "9",        "Indian Ocean" },
-        { "0",        "Pacific Ocean" },
-        { "a",        "UTC" }
+        { "4",        "Asia" },
+        { "5",        "Atlantic Ocean" },
+        { "6",        "Australia" },
+        { "7",        "Europe" },
+        { "8",        "Indian Ocean" },
+        { "9",        "Pacific Ocean" },
+        { "0",        "UTC" }
 };
 
 #define NCONTINENTS     \
     (int)((sizeof(continent_items)) / (sizeof(continent_items[0])))
 static dialogMenuItem continents[NCONTINENTS];
 
-#define OCEANP(x)       ((x) == 3 || (x) == 5 || (x) == 8 || (x) == 9)
+#define OCEANP(x)       ((x) == 4 || (x) == 7 || (x) == 8)
 
 static int
 continent_country_menu(dialogMenuItem *continent)
 {
         char                title[64], prompt[64];
         struct continent *contp = continent->data;
         int                isocean = OCEANP(continent - continents);
         int             menulen;

 
 static void
 read_zones(void)
 {
         char            contbuf[16];
         FILE            *fp;
         struct continent *cont;
         size_t          len, contlen;
-        char                *line, *tlc, *file, *descr, *p;
+        char                *line, *country_list, *tlc, *file, *descr, *p;
         int             lineno;
 
         fp = fopen(path_zonetab, "r");
         if (!fp)
                 err(1, "%s", path_zonetab);
         lineno = 0;
 
         while ((line = fgetln(fp, &len)) != NULL) {
                 lineno++;
                 if (line[len - 1] != '\n')
                         errx(1, "%s:%d: invalid format", path_zonetab, lineno);
                 line[len - 1] = '\0';
                 if (line[0] == '#')
                         continue;
 
-                tlc = strsep(&line, "\t");
-                if (strlen(tlc) != 2)
-                        errx(1, "%s:%d: invalid country code `%s'",
-                            path_zonetab, lineno, tlc);
+                country_list = strsep(&line, "\t");
                 /* coord = */ strsep(&line, "\t");         /* Unused */
                 file = strsep(&line, "\t");
                 /* get continent portion from continent/country */
                 p = strchr(file, '/');
                 if (p == NULL)
                         errx(1, "%s:%d: invalid zone name `%s'", path_zonetab,
                             lineno, file);
                 contlen = p - file + 1;                /* trailing nul */
                 if (contlen > sizeof(contbuf))
                         errx(1, "%s:%d: continent name in zone name `%s' too long",
                             path_zonetab, lineno, file);
                 strlcpy(contbuf, file, contlen);
                 cont = find_continent(contbuf);
                 if (!cont)
                         errx(1, "%s:%d: invalid region `%s'", path_zonetab,
                             lineno, contbuf);
 
                 descr = (line != NULL && *line != '\0') ? line : NULL;
 
+                while (country_list != NULL) {
+                        tlc = strsep(&country_list, ",");
+                        if (strlen(tlc) != 2)
+                                errx(1, "%s:%d: invalid country code `%s'",
+                                    path_zonetab, lineno, tlc);
                         add_zone_to_country(lineno, tlc, descr, file, cont);
+                }
         }
         fclose(fp);
 }
 
 static void
 make_menus(void)
 {
         struct country  *cp;

head/usr.sbin/cron/cron/database.c

 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 
 #ifdef HAVE_DIALOG
 #include <dialog.h>
 #endif
 
-#define _PATH_ZONETAB           "/usr/share/zoneinfo/zone.tab"
+#define _PATH_ZONETAB           "/usr/share/zoneinfo/zone1970.tab"
 #define _PATH_ISO3166           "/usr/share/misc/iso3166"
 #define _PATH_ZONEINFO          "/usr/share/zoneinfo"
 #define _PATH_LOCALTIME         "/etc/localtime"
 #define _PATH_DB                "/var/db/zoneinfo"
 #define _PATH_WALL_CMOS_CLOCK   "/etc/wall_cmos_clock"
 
 #ifdef PATH_MAX
 #define SILLY_BUFFER_SIZE       2*PATH_MAX

 static int        set_zone_menu(dialogMenuItem *);
 static int      set_zone_utc(void);
 
 struct continent {
         dialogMenuItem *menu;
         int             nitems;
 };
 
-static struct continent        africa, america, antarctica, arctic, asia, atlantic;
+static struct continent        africa, america, antarctica, asia, atlantic;
 static struct continent        australia, europe, indian, pacific, utc;
 
 static struct continent_names {
         const char      *name;
         struct continent *continent;
 } continent_names[] = {
         { "Africa",        &africa },
         { "America",        &america },
         { "Antarctica",        &antarctica },
-        { "Arctic",        &arctic },
         { "Asia",        &asia },
         { "Atlantic",        &atlantic },
         { "Australia",        &australia },
         { "Europe",        &europe },
         { "Indian",        &indian },
         { "Pacific",        &pacific },
         { "UTC",        &utc }
 };
 
 static struct continent_items {
         char            prompt[2];
         char            title[30];
 } continent_items[] = {
         { "1",        "Africa" },
         { "2",        "America -- North and South" },
         { "3",        "Antarctica" },
-        { "4",        "Arctic Ocean" },
-        { "5",        "Asia" },
-        { "6",        "Atlantic Ocean" },
-        { "7",        "Australia" },
-        { "8",        "Europe" },
-        { "9",        "Indian Ocean" },
-        { "0",        "Pacific Ocean" },
-        { "a",        "UTC" }
+        { "4",        "Asia" },
+        { "5",        "Atlantic Ocean" },
+        { "6",        "Australia" },
+        { "7",        "Europe" },
+        { "8",        "Indian Ocean" },
+        { "9",        "Pacific Ocean" },
+        { "0",        "UTC" }
 };
 
 #define NCONTINENTS     \
     (int)((sizeof(continent_items)) / (sizeof(continent_items[0])))
 static dialogMenuItem continents[NCONTINENTS];
 
-#define OCEANP(x)       ((x) == 3 || (x) == 5 || (x) == 8 || (x) == 9)
+#define OCEANP(x)       ((x) == 4 || (x) == 7 || (x) == 8)
 
 static int
 continent_country_menu(dialogMenuItem *continent)
 {
         char                title[64], prompt[64];
         struct continent *contp = continent->data;
         int                isocean = OCEANP(continent - continents);
         int             menulen;

 
 static void
 read_zones(void)
 {
         char            contbuf[16];
         FILE            *fp;
         struct continent *cont;
         size_t          len, contlen;
-        char                *line, *tlc, *file, *descr, *p;
+        char                *line, *country_list, *tlc, *file, *descr, *p;
         int             lineno;
 
         fp = fopen(path_zonetab, "r");
         if (!fp)
                 err(1, "%s", path_zonetab);
         lineno = 0;
 
         while ((line = fgetln(fp, &len)) != NULL) {
                 lineno++;
                 if (line[len - 1] != '\n')
                         errx(1, "%s:%d: invalid format", path_zonetab, lineno);
                 line[len - 1] = '\0';
                 if (line[0] == '#')
                         continue;
 
-                tlc = strsep(&line, "\t");
-                if (strlen(tlc) != 2)
-                        errx(1, "%s:%d: invalid country code `%s'",
-                            path_zonetab, lineno, tlc);
+                country_list = strsep(&line, "\t");
                 /* coord = */ strsep(&line, "\t");         /* Unused */
                 file = strsep(&line, "\t");
                 /* get continent portion from continent/country */
                 p = strchr(file, '/');
                 if (p == NULL)
                         errx(1, "%s:%d: invalid zone name `%s'", path_zonetab,
                             lineno, file);
                 contlen = p - file + 1;                /* trailing nul */
                 if (contlen > sizeof(contbuf))
                         errx(1, "%s:%d: continent name in zone name `%s' too long",
                             path_zonetab, lineno, file);
                 strlcpy(contbuf, file, contlen);
                 cont = find_continent(contbuf);
                 if (!cont)
                         errx(1, "%s:%d: invalid region `%s'", path_zonetab,
                             lineno, contbuf);
 
                 descr = (line != NULL && *line != '\0') ? line : NULL;
 
+                while (country_list != NULL) {
+                        tlc = strsep(&country_list, ",");
+                        if (strlen(tlc) != 2)
+                                errx(1, "%s:%d: invalid country code `%s'",
+                                    path_zonetab, lineno, tlc);
                         add_zone_to_country(lineno, tlc, descr, file, cont);
+                }
         }
         fclose(fp);
 }
 
 static void
 make_menus(void)
 {
         struct country  *cp;