Use rentrant mysql lib, eliminate race in sql_list, Win32 streams, misc see kes-1.31

[bacula/bacula] / bacula / src / stored / stored_conf.h

diff --git a/bacula/src/stored/stored_conf.h b/bacula/src/stored/stored_conf.h
index 80c0f98a5841c596e3f239f5628ea20186646cbb..91d2560896fe73aec009991d096bed244c0f7128 100644 (file)
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -45,6 +45,7 @@ struct s_res_dir {
 
    char *password;                    /* Director password */
    char *address;                     /* Director IP address or zero */
+   int enable_ssl;                    /* Use SSL with this Director */
 };
 typedef struct s_res_dir DIRRES;
 
@@ -60,8 +61,10 @@ struct s_res_store {
    char *working_directory;           /* working directory for checkpoints */
    char *pid_directory;
    char *subsys_directory;
+   int require_ssl;                   /* Require SSL on all connections */
    uint32_t max_concurrent_jobs;      /* maximum concurrent jobs to run */
    struct s_res_msgs *messages;       /* Daemon message handler */
+   utime_t heartbeat_interval;        /* Interval to send hb to FD */
 };
 typedef struct s_res_store STORES;
 
@@ -77,6 +80,7 @@ struct s_res_dev {
    uint32_t max_changer_wait;         /* Changer timeout */
    uint32_t max_rewind_wait;          /* maximum secs to wait for rewind */
    uint32_t max_open_wait;            /* maximum secs to wait for open */
+   uint32_t max_open_vols;            /* maximum simultaneous open volumes */
    uint32_t min_block_size;           /* min block size */
    uint32_t max_block_size;           /* max block size */
    uint32_t max_volume_jobs;          /* max jobs to put on one volume */