d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cron(8): Reload database if an existing job in cron.d changed as well

Browse Source 
Directory mtime will only change if a file is added or removed, not
modified. For /var/cron/tabs, this is fine because of how crontab(1) manages
it using temp files so all crontab(1) changes will trigger a reload of the
database.

For /etc/cron.d and /usr/local/etc/cron.d, this is not necessarily the case.
Instead of checking their mtime, we should descend into them and check mtime
on all jobs also.

Reported by:	des
Reviewed by:	bapt
MFC after:	1 week
This commit is contained in:
Kyle Evans 2018-04-12 13:52:55 +00:00
parent 81f187e576
commit 1cb7491a3f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=332429
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/cron/cron/database.c
View File

@ -56,7 +56,7 @@ load_database(old_db)
{ SYSCRONTABS },
{ LOCALSYSCRONTABS }
};
int i;
int i, ret;
Debug(DLOAD, ("[%d] load_database()\n", getpid()))
@ -79,6 +79,18 @@ load_database(old_db)
for (i = 0; i < nitems(syscrontabs); i++) {
if (stat(syscrontabs[i].name, &syscrontabs[i].st) != -1) {
maxmtime = TMAX(syscrontabs[i].st.st_mtime, maxmtime);
/* Traverse into directory */
if (!(dir = opendir(syscrontabs[i].name)))
continue;
while (NULL != (dp = readdir(dir))) {
if (dp->d_name[0] == '.')
continue;
ret = fstatat(dirfd(dir), dp->d_name, &st, 0);
if (ret == 0 && !S_ISREG(st.st_mode))
continue;
maxmtime = TMAX(st.st_mtime, maxmtime);
}
closedir(dir);
} else {
syscrontabs[i].st.st_mtime = 0;
}