Time zones are now supported.

Setting in cron table CRON_TZ=SomeTimeZone does jobs in
this time zone. There was problem with syslog, because
it print local time into log only, when I remove
ifdef parts from misc.c. With ifdef parts print out the time
of 'highest' time zone, which could be bug of rsyslog.

diff --git a/src/cron.c b/src/cron.c
index 671afe57cb17108601bbcc1f1aacf1dbdb7df937..5100430f13d0d8553a947a45042e4fd7e2647a0b 100644 (file)
--- a/src/cron.c
+++ b/src/cron.c
@@ -296,6 +296,7 @@ run_reboot_jobs(cron_db *db) {
 
 static void
 find_jobs(int vtime, cron_db *db, int doWild, int doNonWild) {
+       char orig_tz, *job_tz;
        time_t virtualSecond  = vtime * SECONDS_PER_MINUTE;
        struct tm *tm = gmtime(&virtualSecond);
        int minute, hour, dom, month, dow;
@@ -304,11 +305,24 @@ find_jobs(int vtime, cron_db *db, int doWild, int doNonWild) {
 
        /* make 0-based values out of these so we can use them as indicies
         */
-       minute = tm->tm_min -FIRST_MINUTE;
-       hour = tm->tm_hour -FIRST_HOUR;
-       dom = tm->tm_mday -FIRST_DOM;
-       month = tm->tm_mon +1 /* 0..11 -> 1..12 */ -FIRST_MONTH;
-       dow = tm->tm_wday -FIRST_DOW;
+#define maketime(tz1, tz2) do { \
+       char *t = tz1; \
+       if (t != NULL && *t != '\0') \
+               setenv("TZ", t, 1); \
+       else if ((tz2) != NULL) \
+               setenv("TZ", (tz2), 1); \
+       else \
+               unsetenv("TZ"); \
+       tm = localtime(&StartTime); \
+       minute = tm->tm_min -FIRST_MINUTE; \
+       hour = tm->tm_hour -FIRST_HOUR; \
+       dom = tm->tm_mday -FIRST_DOM; \
+       month = tm->tm_mon +1 /* 0..11 -> 1..12 */ -FIRST_MONTH; \
+       dow = tm->tm_wday -FIRST_DOW; \
+       } while (0)
+
+       orig_tz = getenv("TZ");
+       maketime(NULL, orig_tz);
 
        Debug(DSCH, ("[%ld] tick(%d,%d,%d,%d,%d) %s %s\n",
                     (long)getpid(), minute, hour, dom, month, dow,
@@ -325,6 +339,9 @@ find_jobs(int vtime, cron_db *db, int doWild, int doNonWild) {
                        Debug(DSCH|DEXT, ("user [%s:%ld:%ld:...] cmd=\"%s\"\n",
                            e->pwd->pw_name, (long)e->pwd->pw_uid,
                            (long)e->pwd->pw_gid, e->cmd))
+
+                       job_tz = env_get("CRON_TZ", e->envp);
+                       maketime(job_tz, orig_tz);
                        if (bit_test(e->minute, minute) &&
                            bit_test(e->hour, hour) &&
                            bit_test(e->month, month) &&
@@ -340,6 +357,10 @@ find_jobs(int vtime, cron_db *db, int doWild, int doNonWild) {
                        }
                }
        }
+       if (orig_tz != NULL)
+               setenv("TZ", orig_tz, 1);
+       else
+               unsetenv("TZ");
 }
 
 /*

diff --git a/src/misc.c b/src/misc.c
index 30c7ef5860caa9e41610080825e2ee7aa8167466..918e7e060dcdfad1fd373e549022037767c40e20 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -506,12 +506,10 @@ log_it(const char *username, PID_T xpid, const char *event, const char *detail)
 #if defined(LOG_FILE) || DEBUGGING
        PID_T pid = xpid;
 #endif
-#if defined(LOG_FILE)
        char *msg;
        TIME_T now = time((TIME_T) 0);
        struct tm *t = localtime(&now);
        int msg_size;
-#endif /*LOG_FILE*/
 
 #if defined(LOG_FILE)
        /* we assume that MAX_TEMPSTR will hold the date, time, &punctuation.