From: mmaslano <mmaslano@redhat.com>
Date: Fri, 24 Aug 2007 06:16:40 +0000 (+0200)
Subject: System table wasn't sometimes checked for changes.
X-Git-Tag: v4.2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e2b795f12bfb0912b2dac1dce5e3066092a9aac;p=cronie

System table wasn't sometimes checked for changes.
---

diff --git a/misc.c b/misc.c
index aab32bb..862147c 100644
--- a/misc.c
+++ b/misc.c
@@ -214,7 +214,7 @@ set_cron_cwd(void) {
 #ifdef CRON_GROUP
 	grp = getgrnam(CRON_GROUP);
 #endif
-	/* first check for CRONDIR ("/var/cron" or some such)
+	/* first check for CRONDIR ("/var/spool" or some such)
 	 */
 	if (stat(CRONDIR, &sb) < OK && errno == ENOENT) {
 		perror(CRONDIR);
@@ -270,6 +270,37 @@ set_cron_cwd(void) {
 			exit(ERROR_EXIT);
 		    }
 	}
+	/* now check the RH_CROND_DIR */
+	if (stat(RH_CROND_DIR, &sb) < OK && errno == ENOENT) {
+        perror(RH_CROND_DIR);
+        if (OK == mkdir(RH_CROND_DIR, 0700)) {
+            fprintf(stderr, "%s: created\n", RH_CROND_DIR);
+            stat(RH_CROND_DIR, &sb);
+        } else {
+            fprintf(stderr, "%s: ", RH_CROND_DIR);
+            perror("mkdir");
+            exit(ERROR_EXIT);
+        }
+    }
+    if (!S_ISDIR(sb.st_mode)) {
+        fprintf(stderr, "'%s' is not a directory, bailing out.\n",
+            RH_CROND_DIR);
+        exit(ERROR_EXIT);
+    }
+    if (grp != NULL) {
+        if (sb.st_gid != grp->gr_gid)
+            if( chown(RH_CROND_DIR, -1, grp->gr_gid) == -1 )
+            {
+            fprintf(stderr,"chdir %s failed: %s\n", RH_CROND_DIR, strerror(errno));
+            exit(ERROR_EXIT);
+            }
+        if (sb.st_mode != 01730)
+            if( chmod(RH_CROND_DIR, 01730) == -1 )
+            {
+            fprintf(stderr,"chmod 01730 %s failed: %s\n", RH_CROND_DIR, strerror(errno));
+            exit(ERROR_EXIT);
+            }
+    }
 }
 
 /* acquire_daemonlock() - write our PID into /etc/cron.pid, unless