ctl_zoneinfo,http_tzdist: use and require zoneinfo_dir for tzdist service

Author: elliefm

Diff for: imap/ctl_zoneinfo.c

@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 {
     int opt, r = 0;
     char *alt_config = NULL, *pub = NULL, *ver = NULL, *winfile = NULL;
-    char prefix[2048];
+    const char *zoneinfo_dir = NULL;
     enum { REBUILD, WINZONES, NONE } op = NONE;
 
     while ((opt = getopt(argc, argv, "C:r:vw:")) != EOF) {
@@ -130,7 +130,12 @@ int main(int argc, char **argv)
     signals_set_shutdown(&shut_down);
     signals_add_handlers(0);
 
-    snprintf(prefix, sizeof(prefix), "%s%s", config_dir, FNAME_ZONEINFODIR);
+    zoneinfo_dir = config_getstring(IMAPOPT_ZONEINFO_DIR);
+    if (!zoneinfo_dir) {
+        fprintf(stderr, "zoneinfo_dir must be set for tzdist service\n");
+        cyrus_done();
+        return EX_CONFIG;
+    }
 
     switch (op) {
     case REBUILD: {
@@ -150,7 +155,7 @@ int main(int argc, char **argv)
         hash_insert(INFO_TZID, info, &tzentries);
 
         /* Add LEAP record (last updated and hash) */
-        snprintf(buf, sizeof(buf), "%s%s", prefix, FNAME_LEAPSECFILE);
+        snprintf(buf, sizeof(buf), "%s%s", zoneinfo_dir, FNAME_LEAPSECFILE);
         if (verbose) printf("Processing leap seconds file %s\n", buf);
         if (!(fp = fopen(buf, "r"))) {
             fprintf(stderr, "Could not open leap seconds file %s\n", buf);
@@ -187,7 +192,7 @@ int main(int argc, char **argv)
         }
 
         /* Add ZONE/LINK records */
-        do_zonedir(prefix, &tzentries, info);
+        do_zonedir(zoneinfo_dir, &tzentries, info);
 
         zoneinfo_open(NULL);
 
@@ -243,8 +248,8 @@ int main(int argc, char **argv)
             goto done;
         }
 
-        if (chdir(prefix)) {
-            fprintf(stderr, "chdir(%s) failed\n", prefix);
+        if (chdir(zoneinfo_dir)) {
+            fprintf(stderr, "chdir(%s) failed\n", zoneinfo_dir);
             goto done;
         }
 
@@ -371,7 +376,7 @@ void do_zonedir(const char *dir, struct hash_table *tzentries,
 
             /* Isolate alias in path */
             path[plen-4] = '\0';  /* Trim ".ics" */
-            alias = path + strlen(config_dir) + strlen("zoneinfo") + 2;
+            alias = path + strlen(dir) + 1;
 
             if (verbose) printf("\tLINK: %s -> %s\n", alias, tzid);
 

Diff for: imap/http_tzdist.c

@@ -85,6 +85,7 @@ static time_t compile_time;
 static unsigned synctoken_prefix;
 static ptrarray_t *leap_seconds = NULL;
 static int geo_enabled = 0;
+static const char *zoneinfo_dir = NULL;
 static void tzdist_init(struct buf *serverinfo);
 static void tzdist_shutdown(void);
 static int meth_get(struct transaction_t *txn, void *params);
@@ -193,8 +194,7 @@ static void open_shape_file(struct buf *serverinfo)
     buf_printf(serverinfo, " ShapeLib/%s", SHAPELIB_VERSION);
 
     /* Open the tz_world shape files */
-    snprintf(buf, sizeof(buf), "%s%s%s",
-             config_dir, FNAME_ZONEINFODIR, FNAME_WORLD_SHAPEFILE);
+    snprintf(buf, sizeof(buf), "%s%s", zoneinfo_dir, FNAME_WORLD_SHAPEFILE);
     if (!(tz_world.shp = SHPOpen(buf, "rb"))) {
         syslog(LOG_ERR, "Failed to open file %s", buf);
         return;
@@ -224,8 +224,7 @@ static void open_shape_file(struct buf *serverinfo)
     geo_enabled = tz_world.valid = 1;
 
     /* Open the tz_antarctica shape files (optional) */
-    snprintf(buf, sizeof(buf), "%s%s%s",
-             config_dir, FNAME_ZONEINFODIR, FNAME_AQ_SHAPEFILE);
+    snprintf(buf, sizeof(buf), "%s%s", zoneinfo_dir, FNAME_AQ_SHAPEFILE);
     if (!(tz_aq.shp = SHPOpen(buf, "rb"))) {
         syslog(LOG_NOTICE, "Failed to open file %s", buf);
         return;
@@ -601,8 +600,7 @@ static void read_leap_seconds()
     char buf[1024];
     struct leapsec *leap;
 
-    snprintf(buf, sizeof(buf), "%s%s%s",
-             config_dir, FNAME_ZONEINFODIR, FNAME_LEAPSECFILE);
+    snprintf(buf, sizeof(buf), "%s%s", zoneinfo_dir, FNAME_LEAPSECFILE);
     if (!(fp = fopen(buf, "r"))) {
         syslog(LOG_ERR, "Failed to open file %s", buf);
         return;
@@ -651,6 +649,14 @@ static void tzdist_init(struct buf *serverinfo __attribute__((unused)))
         return;
     }
 
+    /* Find configured zoneinfo_zir */
+    zoneinfo_dir = config_getstring(IMAPOPT_ZONEINFO_DIR);
+    if (!zoneinfo_dir) {
+        syslog(LOG_ERR, "zoneinfo_dir must be set for tzdist service");
+        namespace_tzdist.enabled = 0;
+        return;
+    }
+
     compile_time = calc_compile_time(__TIME__, __DATE__);
 
     buf_printf(&buf, "Cyrus TZdist: %s", config_servername);
@@ -1866,8 +1872,7 @@ static int action_get(struct transaction_t *txn)
 
         /* Open, mmap, and parse the file */
         buf_reset(&pathbuf);
-        buf_printf(&pathbuf, "%s%s/%s.ics",
-                   config_dir, FNAME_ZONEINFODIR, tzid);
+        buf_printf(&pathbuf, "%s/%s.ics", zoneinfo_dir, tzid);
         path = buf_cstring(&pathbuf);
         if ((fd = open(path, O_RDONLY)) == -1) return HTTP_SERVER_ERROR;
 
@@ -2075,8 +2080,7 @@ static int action_expand(struct transaction_t *txn)
 
         /* Open, mmap, and parse the file */
         buf_reset(&pathbuf);
-        buf_printf(&pathbuf, "%s%s/%s.ics",
-                   config_dir, FNAME_ZONEINFODIR, tzid);
+        buf_printf(&pathbuf, "%s/%s.ics", zoneinfo_dir, tzid);
         path = buf_cstring(&pathbuf);
         if ((fd = open(path, O_RDONLY)) == -1) return HTTP_SERVER_ERROR;
 

Diff for: imap/zoneinfo_db.h

@@ -48,9 +48,6 @@
 
 #include "annotate.h" /* for strlist functionality */
 
-/* name of the zoneinfo directory */
-#define FNAME_ZONEINFODIR "/zoneinfo"
-
 /* name of the NIST leap seconds file (provided with IANA tzdata) */
 #define FNAME_LEAPSECFILE "/leap-seconds.list"
 

Diff for: lib/imapoptions

@@ -2881,7 +2881,8 @@ of the incoming network interface, or if no record is found, the
    INBOX, NOT an email address! */
 
 { "zoneinfo_db", "twoskip", STRINGLIST("flat", "skiplist", "twoskip", "zeroskip"), "3.1.6" }
-/* The cyrusdb backend to use for zoneinfo. */
+/* The cyrusdb backend to use for zoneinfo.  This database is used by the
+   "tzdist" \fIhttp_modules\fR, and is managed by \fBctl_zoneinfo(8)\fR.*/
 
 { "zoneinfo_db_path", NULL, STRING, "2.5.0" }
 /* The absolute path to the zoneinfo db file.  If not specified,
@@ -2890,7 +2891,11 @@ of the incoming network interface, or if no record is found, the
 { "zoneinfo_dir", NULL, STRING, "3.2.0" }
 /* The absolute path to the zoneinfo directory, containing timezone
    definitions as generated by the vzic tool.  If not specified, whatever
-   definitions libical finds will be used. */
+   definitions libical finds will be used.
+.PP
+   If you are providing a Time Zone Data Distribution Service (i.e. you have
+   "tzdist" listed in \fIhttp_modules\fR), then this configuration option MUST
+   be specified. */
 
 { "object_storage_enabled", 0, SWITCH, "3.0.0" }
 /* Is Object storage enabled for this server.  You also need to have