Rename RH_CRON_DIR to SYS_CRON_DIR.

diff --git a/src/cron.c b/src/cron.c
index 5b0ce2d6d178825dd7621980b8047e0e9f8f7eda..2e0e6954a7ac4227d59d7eb6369e05ccee7f9f19 100644 (file)
--- a/src/cron.c
+++ b/src/cron.c
@@ -51,7 +51,7 @@ static        long                    GMToff;
 #define NUM_WATCHES 3
 
 int wd[NUM_WATCHES];
-const char *watchpaths[NUM_WATCHES] = { SPOOL_DIR, RH_CROND_DIR, SYSCRONTAB };
+const char *watchpaths[NUM_WATCHES] = { SPOOL_DIR, SYS_CROND_DIR, SYSCRONTAB };
 
 void
 set_cron_unwatched(int fd) {

diff --git a/src/database.c b/src/database.c
index 12e8c209c7e5057370d7356091e8e9ea931ece3b..8281654f7b586d7ddab12d7fcdb87a7bbe9529fa 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -202,8 +202,8 @@ check_inotify_database(cron_db *old_db) {
 
                process_crontab("root", NULL, SYSCRONTAB, &new_db, old_db);
 
-               if (!(dir = opendir(RH_CROND_DIR))) {
-                       log_it("CRON", pid, "OPENDIR FAILED", RH_CROND_DIR, errno);
+               if (!(dir = opendir(SYS_CROND_DIR))) {
+                       log_it("CRON", pid, "OPENDIR FAILED", SYS_CROND_DIR, errno);
                } else {
                        while (NULL != (dp = readdir(dir))) {
                                char tabname[MAXNAMLEN+1];
@@ -211,7 +211,7 @@ check_inotify_database(cron_db *old_db) {
                                if (not_a_crontab(dp))
                                        continue;
 
-                               if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, dp->d_name, '/'))
+                               if (!glue_strings(tabname, sizeof tabname, SYS_CROND_DIR, dp->d_name, '/'))
                                        continue;
                                process_crontab("root", NULL, tabname, &new_db, old_db);
                        }
@@ -295,11 +295,11 @@ load_database(cron_db *old_db) {
                max_mtime(SPOOL_DIR, &statbuf);
        }
 
-       if (stat(RH_CROND_DIR, &crond_stat) < OK) {
-               log_it("CRON", pid, "STAT FAILED", RH_CROND_DIR, errno);
+       if (stat(SYS_CROND_DIR, &crond_stat) < OK) {
+               log_it("CRON", pid, "STAT FAILED", SYS_CROND_DIR, errno);
                crond_stat.st_mtime = 0;
        } else {
-               max_mtime(RH_CROND_DIR, &crond_stat);
+               max_mtime(SYS_CROND_DIR, &crond_stat);
        }
 
        /* track system crontab file
@@ -337,8 +337,8 @@ load_database(cron_db *old_db) {
        if (syscron_stat.st_mtime)
                process_crontab("root", NULL, SYSCRONTAB, &new_db, old_db);
 
-       if (!(dir = opendir(RH_CROND_DIR))) {
-               log_it("CRON", pid, "OPENDIR FAILED", RH_CROND_DIR, errno);
+       if (!(dir = opendir(SYS_CROND_DIR))) {
+               log_it("CRON", pid, "OPENDIR FAILED", SYS_CROND_DIR, errno);
        } else {
                while (NULL != (dp = readdir(dir))) {
                        char   tabname[MAXNAMLEN+1];
@@ -346,7 +346,7 @@ load_database(cron_db *old_db) {
                        if ( not_a_crontab( dp ) )
                                continue;
 
-                       if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, dp->d_name, '/'))
+                       if (!glue_strings(tabname, sizeof tabname, SYS_CROND_DIR, dp->d_name, '/'))
                                continue;       /* XXX log? */
 
                        process_crontab("root", NULL, tabname, &new_db, old_db);

diff --git a/src/pathnames.h b/src/pathnames.h
index 1577e3d049a1e00ace0057a718f1e5d2d0cb1b96..a7616e845c473fc7cfed46b6047abffab04a6f9f 100644 (file)
--- a/src/pathnames.h
+++ b/src/pathnames.h
@@ -70,8 +70,8 @@
                        /* 4.3BSD-style crontab */
 #define SYSCRONTAB     "/etc/crontab"
 
-                        /* Red Hat crond crontab dir */ 
-#define RH_CROND_DIR    "/etc/cron.d"
+                        /* system crontab dir */ 
+#define SYS_CROND_DIR    "/etc/cron.d"
 
                        /* what editor to use if no EDITOR or VISUAL
                         * environment variable specified.