Use the command line utility dropdb instead of the psql command

[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..7cf81d72d8e0a936c1631d07eb7923030c832ebe 100644 (file)
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -40,13 +40,13 @@
 #define R_BACKUP                      3024
 
 /* Definition of the contents of each Resource */
-struct s_res_dir {
+struct DIRRES {
    RES   hdr;
 
    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;
 
 
 /* Storage daemon "global" definitions */
@@ -60,23 +60,26 @@ 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 */
+   MSGS *messages;                    /* Daemon message handler */
+   utime_t heartbeat_interval;        /* Interval to send hb to FD */
 };
 typedef struct s_res_store STORES;
 
 /* Device specific definitions */
-struct s_res_dev {
+struct DEVRES {
    RES   hdr;
 
    char *media_type;                  /* User assigned media type */
    char *device_name;                 /* Archive device name */
    char *changer_name;                /* Changer device name */
    char *changer_command;             /* Changer command  -- external program */
-   int  cap_bits;                     /* Capabilities of this device */
+   uint32_t cap_bits;                 /* Capabilities of this device */
    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 */
@@ -86,13 +89,11 @@ struct s_res_dev {
    int64_t volume_capacity;           /* advisory capacity */
    DEVICE *dev;                       /* Pointer to phyical dev -- set at runtime */
 };
-typedef struct s_res_dev DEVRES;
-
-union u_res {
-   struct s_res_dir     res_dir;
-   struct s_res_store   res_store;
-   struct s_res_dev     res_dev;
-   struct s_res_msgs    res_msgs;
-   RES hdr;
+
+union URES {
+   DIRRES res_dir;
+   STORES res_store;
+   DEVRES res_dev;
+   MSGS   res_msgs;
+   RES    hdr;
 };
-typedef union u_res URES;