From 9e6e148b8cdca1e6865328c14160063e2fdf3774 Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 22 Jun 2017 07:10:01 +0000 Subject: [PATCH] MFC r308158: r308158 (by bapt): Allow symlinks to be followed in cron.d directories and fix detection of regular files on NFS git-svn-id: svn://svn.freebsd.org/base/stable/10@320223 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/cron/cron/database.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/cron/cron/database.c b/usr.sbin/cron/cron/database.c index 2ac7113c1..2b0c67b9c 100644 --- a/usr.sbin/cron/cron/database.c +++ b/usr.sbin/cron/cron/database.c @@ -44,7 +44,7 @@ load_database(old_db) { DIR *dir; struct stat statbuf; - struct stat syscron_stat; + struct stat syscron_stat, st; time_t maxmtime; DIR_T *dp; cron_db new_db; @@ -124,7 +124,8 @@ load_database(old_db) while (NULL != (dp = readdir(dir))) { if (dp->d_name[0] == '.') continue; - if (dp->d_type != DT_REG) + if (fstatat(dirfd(dir), dp->d_name, &st, 0) == 0 && + !S_ISREG(st.st_mode)) continue; snprintf(tabname, sizeof(tabname), "%s/%s", syscrontabs[i].name, dp->d_name); -- 2.45.0