- Add a kludge to detect bad date/times, which cause a seg fault in

[bacula/bacula] / bacula / src / filed / filed_conf.c

diff --git a/bacula/src/filed/filed_conf.c b/bacula/src/filed/filed_conf.c
index dbbe9a0fcc8226bd09839ac0faef0d497dd5a921..aaa3b33707c5888f441377568048e1480c5fee06 100644 (file)
--- a/bacula/src/filed/filed_conf.c
+++ b/bacula/src/filed/filed_conf.c
@@ -51,6 +51,9 @@
  */
 int r_first = R_FIRST;
 int r_last  = R_LAST;
+static RES *sres_head[R_LAST - R_FIRST + 1];
+RES **res_head = sres_head;
+
 
 /* Forward referenced subroutines */
 
@@ -79,8 +82,10 @@ int  res_all_size = sizeof(res_all);
 static RES_ITEM cli_items[] = {
    {"name",        store_name,  ITEM(res_client.hdr.name), 0, ITEM_REQUIRED, 0},
    {"description", store_str,   ITEM(res_client.hdr.desc), 0, 0, 0},
-   {"fdport",      store_pint,  ITEM(res_client.FDport),  0, ITEM_DEFAULT, 9102},
-   {"fdaddress",   store_str,   ITEM(res_client.FDaddr),  0, 0, 0},
+   {"fdport",      store_addresses_port,    ITEM(res_client.FDaddrs),  0, ITEM_DEFAULT, 9102},
+   {"fdaddress",   store_addresses_address, ITEM(res_client.FDaddrs),  0, ITEM_DEFAULT, 9102},
+   {"fdaddresses", store_addresses,         ITEM(res_client.FDaddrs),  0, ITEM_DEFAULT, 9102},
+
    {"workingdirectory",  store_dir, ITEM(res_client.working_directory), 0, ITEM_REQUIRED, 0}, 
    {"piddirectory",  store_dir,     ITEM(res_client.pid_directory),     0, ITEM_REQUIRED, 0}, 
    {"subsysdirectory",  store_dir,  ITEM(res_client.subsys_directory),  0, 0, 0}, 
@@ -100,6 +105,7 @@ static RES_ITEM dir_items[] = {
    {"password",    store_password, ITEM(res_dir.password),  0, ITEM_REQUIRED, 0},
    {"address",     store_str,      ITEM(res_dir.address),   0, 0, 0},
    {"enablessl",   store_yesno,    ITEM(res_dir.enable_ssl),1, ITEM_DEFAULT, 0},
+   {"monitor",     store_yesno,    ITEM(res_dir.monitor),   1, ITEM_DEFAULT, 0},
    {NULL, NULL, NULL, 0, 0, 0} 
 };
 
@@ -111,11 +117,11 @@ extern RES_ITEM msgs_items[];
  * It must have one item for each of the resources.
  */
 RES_TABLE resources[] = {
-   {"director",      dir_items,   R_DIRECTOR,  NULL},
-   {"filedaemon",    cli_items,   R_CLIENT,    NULL},
-   {"client",        cli_items,   R_CLIENT,    NULL}, /* alias for filedaemon */
-   {"messages",      msgs_items,  R_MSGS,      NULL},
-   {NULL,           NULL,        0,           NULL}
+   {"director",      dir_items,   R_DIRECTOR},
+   {"filedaemon",    cli_items,   R_CLIENT},
+   {"client",        cli_items,   R_CLIENT},     /* alias for filedaemon */
+   {"messages",      msgs_items,  R_MSGS},
+   {NULL,           NULL,        0}
 };
 
 
@@ -140,7 +146,7 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
         break;
       case R_CLIENT:
          sendit(sock, "Client: name=%s FDport=%d\n", reshdr->name,
-                res->res_client.FDport);
+                get_first_port_host_order(res->res_client.FDaddrs));
         break;
       case R_MSGS:
          sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
@@ -180,40 +186,39 @@ void free_resource(RES *sres, int type)
    if (res->res_dir.hdr.desc) {
       free(res->res_dir.hdr.desc);
    }
-
    switch (type) {
-      case R_DIRECTOR:
-        if (res->res_dir.password) {
-           free(res->res_dir.password);
-        }
-        if (res->res_dir.address) {
-           free(res->res_dir.address);
-        }
-        break;
-      case R_CLIENT:
-        if (res->res_client.working_directory) {
-           free(res->res_client.working_directory);
-        }
-        if (res->res_client.pid_directory) {
-           free(res->res_client.pid_directory);
-        }
-        if (res->res_client.subsys_directory) {
-           free(res->res_client.subsys_directory);
-        }
-        if (res->res_client.FDaddr) {
-           free(res->res_client.FDaddr);
-        }
-        break;
-      case R_MSGS:
-        if (res->res_msgs.mail_cmd)
-           free(res->res_msgs.mail_cmd);
-        if (res->res_msgs.operator_cmd)
-           free(res->res_msgs.operator_cmd);
-        free_msgs_res((MSGS *)res);  /* free message resource */
-        res = NULL;
-        break;
-      default:
-         printf("Unknown resource type %d\n", type);
+   case R_DIRECTOR:
+      if (res->res_dir.password) {
+        free(res->res_dir.password);
+      }
+      if (res->res_dir.address) {
+        free(res->res_dir.address);
+      }
+      break;
+   case R_CLIENT:
+      if (res->res_client.working_directory) {
+        free(res->res_client.working_directory);
+      }
+      if (res->res_client.pid_directory) {
+        free(res->res_client.pid_directory);
+      }
+      if (res->res_client.subsys_directory) {
+        free(res->res_client.subsys_directory);
+      }
+      if (res->res_client.FDaddrs) {
+        free_addresses(res->res_client.FDaddrs);
+      }
+      break;
+   case R_MSGS:
+      if (res->res_msgs.mail_cmd)
+        free(res->res_msgs.mail_cmd);
+      if (res->res_msgs.operator_cmd)
+        free(res->res_msgs.operator_cmd);
+      free_msgs_res((MSGS *)res);  /* free message resource */
+      res = NULL;
+      break;
+   default:
+      printf("Unknown resource type %d\n", type);
    }
    /* Common stuff again -- free the resource, recurse to next one */
    if (res) {
@@ -306,12 +311,12 @@ void save_resource(int type, RES_ITEM *items, int pass)
    if (!error) {
       res = (URES *)malloc(size);
       memcpy(res, &res_all, size);
-      if (!resources[rindex].res_head) {
-        resources[rindex].res_head = (RES *)res; /* store first entry */
+      if (!res_head[rindex]) {
+        res_head[rindex] = (RES *)res; /* store first entry */
       } else {
         RES *next;
         /* Add new res to end of chain */
-        for (next=resources[rindex].res_head; next->next; next=next->next) {
+        for (next=res_head[rindex]; next->next; next=next->next) {
            if (strcmp(next->name, res->res_dir.hdr.name) == 0) {
               Emsg2(M_ERROR_TERM, 0,
                   _("Attempt to define second %s resource named \"%s\" is not permitted.\n"),