Rename set_cron_cwd() to check_spool_dir() as we do not do any chdir

anymore.

diff --git a/src/cron.c b/src/cron.c
index ffa919f4057b3741d4d7907e7cbef1537fe946e3..955b1b0fd712530d30850f56dfd73ccb9fb1e65a 100644 (file)
--- a/src/cron.c
+++ b/src/cron.c
@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) {
 
        acquire_daemonlock(0);
        set_cron_uid();
-       set_cron_cwd();
+       check_spool_dir();
 
        if (putenv("PATH=" _PATH_DEFPATH) < 0) {
                log_it("CRON", pid, "DEATH", "can't putenv PATH", errno);

diff --git a/src/crontab.c b/src/crontab.c
index 1a91dfc0a940940d46929f2f0982bd0211c1439b..f6a5e51d798e8a7ad2f210a9886552a0e0836d08 100644 (file)
--- a/src/crontab.c
+++ b/src/crontab.c
@@ -116,7 +116,7 @@ int main(int argc, char *argv[]) {
                argv[1] = n;
        }
        parse_args(argc, argv); /* sets many globals, opens a file */
-       set_cron_cwd();
+       check_spool_dir();
        if (!allowed(RealUser, CRON_ALLOW, CRON_DENY)) {
                fprintf(stderr,
                        "You (%s) are not allowed to use this program (%s)\n",
@@ -304,10 +304,6 @@ static void parse_args(int argc, char *argv[]) {
        }
 
        if (Option == opt_replace) {
-               /* we have to open the file here because we're going to
-                * chdir(2) into /var/cron before we get around to
-                * reading the file.
-                */
                if (!strcmp(Filename, "-"))
                        NewCrontab = stdin;
                else {

diff --git a/src/funcs.h b/src/funcs.h
index f0e576e82dd9bcde4aa843ed96cfa097eedcb35e..afeceddc1618a2fca3b32312c17eee9dfeff4dde 100644 (file)
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -25,7 +25,7 @@
  */
 
 void           set_cron_uid(void),
-               set_cron_cwd(void),
+               check_spool_dir(void),
                open_logfile(void),
                sigpipe_func(void),
                job_add(entry *, user *),

diff --git a/src/misc.c b/src/misc.c
index dbe495232e03faf9c4ea35612fb6d611abaa3bcd..f640f2989fec23adab518994f435348ef163cebf 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -222,7 +222,7 @@ void set_cron_uid(void) {
 #endif
 }
 
-void set_cron_cwd(void) {
+void check_spool_dir(void) {
        struct stat sb;
        struct group *grp = NULL;